nodegit/lib/repository.js at update-libgit2-head · enicky/nodegit · GitHub

Repository navigation

History

100

101

102

103

104

105

106

107

108

109

110

111

112

113

114

115

116

117

118

119

120

121

122

123

124

125

126

127

128

129

130

131

132

133

134

135

136

137

138

139

140

141

142

143

144

145

146

147

148

149

150

151

152

153

154

155

156

157

158

159

160

161

162

163

164

165

166

167

168

169

170

171

172

173

174

175

176

177

178

179

180

181

182

183

184

185

186

187

188

189

190

191

192

193

194

195

196

197

198

199

200

201

202

203

204

205

206

207

208

209

210

211

212

213

214

215

216

217

218

219

220

221

222

223

224

225

226

227

228

229

230

231

232

233

234

235

236

237

238

239

240

241

242

243

244

245

246

247

248

249

250

251

252

253

254

255

256

257

258

259

260

261

262

263

264

265

266

267

268

269

270

271

272

273

274

275

276

277

278

279

280

281

282

283

284

285

286

287

288

289

290

291

292

293

294

295

296

297

298

299

300

301

302

303

304

305

306

307

308

309

310

311

312

313

314

315

316

317

318

319

320

321

322

323

324

325

326

327

328

329

330

331

332

333

334

335

336

337

338

339

340

341

342

343

344

345

346

347

348

349

350

351

352

353

354

355

356

357

358

359

360

361

362

363

364

365

366

367

368

369

370

371

372

373

374

375

376

377

378

379

380

381

382

383

384

385

386

387

388

389

390

391

392

393

394

395

396

397

398

399

400

401

402

403

404

405

406

407

408

409

410

411

412

413

414

415

416

417

418

419

420

421

422

423

424

425

426

427

428

429

430

431

432

433

434

435

436

437

438

439

440

441

442

443

444

445

446

447

448

449

450

451

452

453

454

455

456

457

458

459

460

461

462

463

464

465

466

467

468

469

470

471

472

473

474

475

476

477

478

479

480

481

482

483

484

485

486

487

488

489

490

491

492

493

494

495

496

497

498

499

500

501

502

503

504

505

506

507

508

509

510

511

512

513

514

515

516

517

518

519

520

521

522

523

524

525

526

527

528

529

530

531

532

533

534

535

536

537

538

539

540

541

542

543

544

545

546

547

548

549

550

551

552

553

554

555

556

557

558

559

560

561

562

563

564

565

566

567

568

569

570

571

572

573

574

575

576

577

578

579

580

581

582

583

584

585

586

587

588

589

590

591

592

593

594

595

596

597

598

599

600

601

602

603

604

605

606

607

608

609

610

611

612

613

614

615

616

617

618

619

620

621

622

623

624

625

626

627

628

629

630

631

632

633

634

635

636

637

638

639

640

641

642

643

644

645

646

647

648

649

650

651

652

653

654

655

656

657

658

659

660

661

662

663

664

665

666

667

668

669

670

671

672

673

674

675

676

677

678

679

680

681

682

683

684

685

686

687

688

689

690

691

692

693

694

695

696

697

698

699

700

701

702

703

704

705

706

707

708

709

710

711

712

713

714

715

716

717

718

719

720

721

722

723

724

725

726

727

728

729

730

731

732

733

734

735

736

737

738

739

740

741

742

743

744

745

746

747

748

749

750

751

752

753

754

755

756

757

758

759

760

761

762

763

764

765

766

767

768

769

770

771

772

773

774

775

776

777

778

779

780

781

782

783

784

785

786

787

788

789

790

791

792

793

794

795

796

797

798

799

800

801

802

803

804

805

806

807

808

809

810

811

812

813

814

815

816

817

818

819

820

821

822

823

824

825

826

827

828

829

830

831

832

833

834

835

836

837

838

839

840

841

842

843

844

845

846

847

848

849

850

851

852

853

854

855

856

857

858

859

860

861

862

863

864

865

866

867

868

869

870

871

872

873

874

875

876

877

878

879

880

881

882

883

884

885

886

887

888

889

890

891

892

893

894

895

896

897

898

899

900

901

902

903

904

905

906

907

908

909

910

911

912

913

914

915

916

917

918

919

920

921

922

923

924

925

926

927

928

929

930

931

932

933

934

935

936

937

938

939

940

941

942

943

944

945

946

947

948

949

950

951

952

953

954

955

956

957

958

959

960

961

962

963

964

965

966

967

968

969

970

971

972

973

974

975

976

977

978

979

980

981

982

983

984

985

986

987

988

989

990

991

992

993

994

995

996

997

998

999

1000

var promisify = require("promisify-node");

var fse = promisify(require("fs-extra"));

var NodeGit = require("../");

var Blob = NodeGit.Blob;

var Checkout = NodeGit.Checkout;

var Commit = NodeGit.Commit;

var normalizeOptions = NodeGit.Utils.normalizeOptions;

var shallowClone = NodeGit.Utils.shallowClone;

var path = require("path");

var Reference = NodeGit.Reference;

var Remote = NodeGit.Remote;

var Repository = NodeGit.Repository;

var Revwalk = NodeGit.Revwalk;

var Status = NodeGit.Status;

var StatusFile = NodeGit.StatusFile;

var StatusList = NodeGit.StatusList;

var Submodule = NodeGit.Submodule;

var Tag = NodeGit.Tag;

var Tree = NodeGit.Tree;

var TreeBuilder = NodeGit.Treebuilder;

/**

* Grabs a fresh copy of the index from the repository. Invalidates

* all previously grabbed indexes

* @async

* @return {Index}

Repository.prototype.refreshIndex = function(callback) {

var repo = this;

repo.setIndex(); // clear the index

return repo.index()

.then(function(index) {

if (typeof callback === "function") {

callback(null, index);

}

return index;

}, callback);

};

/**

* Creates a branch with the passed in name pointing to the commit

* @async

* @param {String} name Branch name, e.g. "master"

* @param {Commit|String|Oid} commit The commit the branch will point to

* @param {bool} force Overwrite branch if it exists

* @param {Signature} signature Identity to use to populate reflog

* @param {String} logMessage One line message to be appended to the reflog

* @return {Reference}

Repository.prototype.createBranch =

function(name, commit, force) {

var repo = this;

if (commit instanceof Commit) {

return NodeGit.Branch.create(

repo,

name,

commit,

force ? 1 : 0);

}

else {

return repo.getCommit(commit).then(function(commit) {

return NodeGit.Branch.create(

repo,

name,

commit,

force ? 1 : 0);

});

}

};

/**

* Creates a branch with the passed in name pointing to the commit

* @async

* @param {String} startPath The base path where the lookup starts.

* @param {Number} acrossFs If non-zero, then the lookup will not stop when a

filesystem device change is detected while exploring

parent directories.

* @param {String} ceilingDirs A list of absolute symbolic link free paths.

the search will stop if any of these paths

are hit. This may be set to null

* @return {String} Path of the git repository

var discover = Repository.discover;

Repository.discover = function(startPath, acrossFs, ceilingDirs, callback) {

return discover(startPath, acrossFs, ceilingDirs)

.then(function(foundPath) {

foundPath = path.resolve(foundPath);

if (typeof callback === "function") {

callback(null, foundPath);

}

return foundPath;

}, callback);

};

/**

* Look up a refs's commit.

* @async

* @param {String|Reference} name Ref name, e.g. "master", "refs/heads/master"

* or Branch Ref

* @return {Commit}

Repository.prototype.getReferenceCommit = function(name, callback) {

var repository = this;

return this.getReference(name).then(function(reference) {

return repository.getCommit(reference.target()).then(function(commit) {

if (typeof callback === "function") {

callback(null, commit);

}

return commit;

});

}, callback);

};

/**

* Look up a branch. Alias for `getReference`

* @async

* @param {String|Reference} name Ref name, e.g. "master", "refs/heads/master"

* or Branch Ref

* @return {Reference}

Repository.prototype.getBranch = function(name, callback) {

return this.getReference(name, callback);

};

/**

* Look up a branch's most recent commit. Alias to `getReferenceCommit`

* @async

* @param {String|Reference} name Ref name, e.g. "master", "refs/heads/master"

* or Branch Ref

* @return {Commit}

Repository.prototype.getBranchCommit = function(name, callback) {

return this.getReferenceCommit(name, callback);

};

/**

* Gets the branch that HEAD currently points to

* Is an alias to head()

* @async

* @return {Reference}

Repository.prototype.getCurrentBranch = function() {

return this.head();

};

/**

* Lookup the reference with the given name.

* @async

* @param {String|Reference} name Ref name, e.g. "master", "refs/heads/master"

* or Branch Ref

* @return {Reference}

Repository.prototype.getReference = function(name, callback) {

var repository = this;

return Reference.dwim(this, name).then(function(reference) {

if (reference.isSymbolic()) {

return reference.resolve().then(function(reference) {

reference.repo = repository;

if (typeof callback === "function") {

callback(null, reference);

}

return reference;

}, callback);

} else {

reference.repo = repository;

if (typeof callback === "function") {

callback(null, reference);

}

return reference;

}

}, callback);

};

Repository.getReferences = function(repo, type, refNamesOnly, callback) {

return Reference.list(repo).then(function(refList) {

var refFilterPromises = [];

var filteredRefs = [];

refList.forEach(function(refName) {

refFilterPromises.push(Reference.lookup(repo, refName)

.then(function(ref) {

if (type == Reference.TYPE.LISTALL || ref.type() == type) {

if (refNamesOnly) {

filteredRefs.push(refName);

return;

}

if (ref.isSymbolic()) {

return ref.resolve().then(function(resolvedRef) {

resolvedRef.repo = repo;

filteredRefs.push(resolvedRef);

})

.catch(function() {

// If we can't resolve the ref then just ignore it.

});

}

else {

filteredRefs.push(ref);

}

})

);

});

return Promise.all(refFilterPromises).then(function() {

if (typeof callback === "function") {

callback(null, filteredRefs);

}

return filteredRefs;

}, callback);

});

};

/**

* Lookup references for a repository.

* @async

* @param {Reference.TYPE} type Type of reference to look up

* @return {Array<Reference>}

Repository.prototype.getReferences = function(type, callback) {

return Repository.getReferences(this, type, false, callback);

};

/**

* Lookup reference names for a repository.

* @async

* @param {Reference.TYPE} type Type of reference to look up

* @return {Array<String>}

Repository.prototype.getReferenceNames = function(type, callback) {

return Repository.getReferences(this, type, true, callback);

};

/**

* Retrieve the commit identified by oid.

* @async

* @param {String|Oid} String sha or Oid

* @return {Commit}

Repository.prototype.getCommit = function(oid, callback) {

var repository = this;

return Commit.lookup(repository, oid).then(function(commit) {

commit.repo = repository;

if (typeof callback === "function") {

callback(null, commit);

}

return commit;

}, callback);

};

/**

* Retrieve the blob represented by the oid.

* @async

* @param {String|Oid} String sha or Oid

* @return {Blob}

Repository.prototype.getBlob = function(oid, callback) {

var repository = this;

return Blob.lookup(repository, oid).then(function(blob) {

blob.repo = repository;

if (typeof callback === "function") {

callback(null, blob);

}

return blob;

}, callback);

};

/**

* Retrieve the tree represented by the oid.

* @async

* @param {String|Oid} String sha or Oid

* @return {Tree}

Repository.prototype.getTree = function(oid, callback) {

var repository = this;

return Tree.lookup(repository, oid).then(function(tree) {

tree.repo = repository;

if (typeof callback === "function") {

callback(null, tree);

}

return tree;

}, callback);

};

/**

* Creates a new annotated tag

* @async

* @param {String|Oid} String sha or Oid

* @param {String} name the name of the tag

* @param {String} message the description that will be attached to the

* annotated tag

* @return {Tag}

Repository.prototype.createTag = function(oid, name, message, callback) {

var repository = this;

var signature = repository.defaultSignature();

return Commit.lookup(repository, oid)

.then(function(commit) {

// Final argument is `force` which overwrites any previous tag

return Tag.create(repository, name, commit, signature, message, 0);

})

.then(function(tagOid) {

return repository.getTag(tagOid, callback);

});

};

/**

* Creates a new lightweight tag

* @async

* @param {String|Oid} String sha or Oid

* @param {String} name the name of the tag

* @return {Reference}

Repository.prototype.createLightweightTag = function(oid, name, callback) {

var repository = this;

return Commit.lookup(repository, oid)

.then(function(commit) {

// Final argument is `force` which overwrites any previous tag

return Tag.createLightweight(repository, name, commit, 0);

})

.then(function() {

return Reference.lookup(repository, "refs/tags/" + name);

});

};

/**

* Retrieve the tag represented by the oid.

* @async

* @param {String|Oid} String sha or Oid

* @return {Tag}

Repository.prototype.getTag = function(oid, callback) {

var repository = this;

return Tag.lookup(repository, oid).then(function(reference) {

reference.repo = repository;

if (typeof callback === "function") {

callback(null, reference);

}

return reference;

}, callback);

};

/**

* Retrieve the tag represented by the tag name.

* @async

* @param {String} Short or full tag name

* @return {Tag}

Repository.prototype.getTagByName = function(name, callback) {

var repo = this;

name = ~name.indexOf("refs/tags/") ? name : "refs/tags/" + name;

return Reference.nameToId(repo, name).then(function(oid) {

return Tag.lookup(repo, oid).then(function(reference) {

reference.repo = repo;

if (typeof callback === "function") {

callback(null, reference);

}

return reference;

});

}, callback);

};

/**

* Deletes a tag from a repository by the tag name.

* @async

* @param {String} Short or full tag name

Repository.prototype.deleteTagByName = function(name) {

var repository = this;

name = ~name.indexOf("refs/tags/") ? name.substr(10) : name;

return Tag.delete(repository, name);

};

/**

* Instantiate a new revision walker for browsing the Repository"s history.

* See also `Commit.prototype.history()`

* @param {String|Oid} String sha or Oid

* @return {RevWalk}

Repository.prototype.createRevWalk = function() {

var revWalk = Revwalk.create(this);

revWalk.repo = this;

return revWalk;

};

/**

* Retrieve the master branch commit.

* @async

* @return {Commit}

Repository.prototype.getMasterCommit = function(callback) {

return this.getBranchCommit("master", callback);

};

/**

* Retrieve the commit that HEAD is currently pointing to

* @async

* @return {Commit}

Repository.prototype.getHeadCommit = function(callback) {

var repo = this;

return Reference.nameToId(repo, "HEAD")

.then(function(head) {

return repo.getCommit(head, callback);

})

.catch(function() {

return null;

});

};

/**

* Create a commit

* @async

* @param {String} updateRef

* @param {Signature} author

* @param {Signature} committer

* @param {String} message

* @param {Tree|Oid|String} Tree

* @param {Array} parents

* @return {Oid} The oid of the commit

Repository.prototype.createCommit = function(

updateRef, author, committer, message, tree, parents, callback) {

var repo = this;

var promises = [];

parents = parents || [];

promises.push(repo.getTree(tree));

parents.forEach(function(parent) {

promises.push(repo.getCommit(parent));

});

return Promise.all(promises).then(function(results) {

tree = results[0];

// Get the normalized values for our input into the function

var parentsLength = parents.length;

parents = [];

for (var i = 0; i < parentsLength; i++) {

parents.push(results[i + 1]);

}

return Commit.create(

repo,

updateRef,

author,

committer,

null /* use default message encoding */,

message,

tree,

parents.length,

parents

);

}).then(function(commit) {

if (typeof callback === "function") {

callback(null, commit);

}

return commit;

}, callback);

};

/**

* Creates a new commit on HEAD from the list of passed in files

* @async

* @param {Array} filesToAdd

* @param {Signature} author

* @param {Signature} committer

* @param {String} message

* @return {Oid} The oid of the new commit

Repository.prototype.createCommitOnHead = function(

filesToAdd,

author,

committer,

message,

callback) {

var repo = this;

return repo.refreshIndex()

.then(function(index) {

if (!filesToAdd) {

filesToAdd = [];

}

return filesToAdd

.reduce(function(lastFilePromise, filePath) {

return lastFilePromise

.then(function() {

return index.addByPath(filePath);

});

}, Promise.resolve())

.then(function() {

return index.write();

})

.then(function() {

return index.writeTree();

});

})

.then(function(treeOid) {

return repo.getHeadCommit()

.then(function(parent) {

if (parent !== null) { // To handle a fresh repo with no commits

parent = [parent];

}

return repo.createCommit(

"HEAD",

author,

committer,

message,

treeOid,

parent

);

});

}, callback);

};

/**

* Create a blob from a buffer

* @param {Buffer} buffer

* @return {Oid}

Repository.prototype.createBlobFromBuffer = function(buffer, callback) {

return Blob.createFromBuffer(this, buffer, buffer.length, callback);

};

/**

* Create a new tree builder.

* @param {Tree} tree

Repository.prototype.treeBuilder = function() {

var builder = TreeBuilder.create(null);

builder.root = builder;

builder.repo = this;

return builder;

};

/**

* Gets the default signature for the default user and now timestamp

* @return {Signature}

Repository.prototype.defaultSignature = function() {

var result = NodeGit.Signature.default(this);

if (!result || !result.name()) {

result = NodeGit.Signature.now("unknown", "unknown@unknown.com");

}

return result;

};

/**

* Lists out the remotes in the given repository.

* @async

* @param {Function} Optional callback

* @return {Object} Promise object.

Repository.prototype.getRemotes = function(callback) {

return Remote.list(this).then(function(remotes) {

if (typeof callback === "function") {

callback(null, remotes);

}

return remotes;

}, callback);

};

/**

* Gets a remote from the repo

* @async

* @param {String|Remote} remote

* @param {Function} callback

* @return {Remote} The remote object

Repository.prototype.getRemote = function(remote, callback) {

if (remote instanceof NodeGit.Remote) {

return Promise.resolve(remote).then(function(remoteObj) {

if (typeof callback === "function") {

callback(null, remoteObj);

}

return remoteObj;

}, callback);

}

return NodeGit.Remote.lookup(this, remote).then(function(remoteObj) {

if (typeof callback === "function") {

callback(null, remoteObj);

}

return remoteObj;

}, callback);

};

/**

* Fetches from a remote

* @async

* @param {String|Remote} remote

* @param {Object|FetchOptions} fetchOptions Options for the fetch, includes

* callbacks for fetching

Repository.prototype.fetch = function(

remote,

fetchOptions,

callback)

{

var repo = this;

function finallyFn(error) {

if (typeof callback === "function") {

callback(error);

}

return repo.getRemote(remote)

.then(function(remote) {

return remote.fetch(null, fetchOptions, "Fetch from " + remote)

.then(function() {

return remote.disconnect();

});

})

.then(finallyFn)

.catch(function(error) {

finallyFn(error);

throw error;

});

};

/**

* Fetches from all remotes. This is done in series due to deadlocking issues

* with fetching from many remotes that can happen.

* @async

* @param {Object|FetchOptions} fetchOptions Options for the fetch, includes

* callbacks for fetching

* @param {Function} callback

Repository.prototype.fetchAll = function(

fetchOptions,

callback)

{

var repo = this;

function createCallbackWrapper(fn, remote) {

return function() {

var args = Array.prototype.slice.call(arguments);

args.push(remote);

return fn.apply(this, args);

}.bind(this);

}

fetchOptions = fetchOptions || {};

var remoteCallbacks = fetchOptions.callbacks || {};

var credentials = remoteCallbacks.credentials;

var certificateCheck = remoteCallbacks.certificateCheck;

var transferProgress = remoteCallbacks.transferProgress;

return repo.getRemotes()

.then(function(remotes) {

return remotes.reduce(function(fetchPromise, remote) {

var wrappedFetchOptions = shallowClone(fetchOptions);

var wrappedRemoteCallbacks = shallowClone(remoteCallbacks);

if (credentials) {

wrappedRemoteCallbacks.credentials =

createCallbackWrapper(credentials, remote);

}

if (certificateCheck) {

wrappedRemoteCallbacks.certificateCheck =

createCallbackWrapper(certificateCheck, remote);

}

if (transferProgress) {

wrappedRemoteCallbacks.transferProgress =

createCallbackWrapper(transferProgress, remote);

}

wrappedFetchOptions.callbacks = wrappedRemoteCallbacks;

return fetchPromise.then(function() {

return repo.fetch(remote, wrappedFetchOptions);

});

}, Promise.resolve());

})

.then(function() {

if (typeof callback === "function") {

callback();

}

});

};

/**

* Merge a branch onto another branch

* @async

* @param {String|Reference} to

* @param {String|Reference} from

* @param {Signature} signature

* @param {Merge.PREFERENCE} mergePreference

* @param {MergeOptions} mergeOptions

* @return {Oid|Index} A commit id for a succesful merge or an index for a

* merge with conflicts

Repository.prototype.mergeBranches =

function(to, from, signature, mergePreference, mergeOptions) {

var repo = this;

var fromBranch;

var toBranch;

mergePreference = mergePreference || NodeGit.Merge.PREFERENCE.NONE;

mergeOptions = normalizeOptions(mergeOptions, NodeGit.MergeOptions);

signature = signature || repo.defaultSignature();

return Promise.all([

repo.getBranch(to),

repo.getBranch(from)

]).then(function(objects) {

toBranch = objects[0];

fromBranch = objects[1];

return Promise.all([

repo.getBranchCommit(toBranch),

repo.getBranchCommit(fromBranch)

]);

})

.then(function(branchCommits) {

var toCommitOid = branchCommits[0].toString();

var fromCommitOid = branchCommits[1].toString();

return NodeGit.Merge.base(repo, toCommitOid, fromCommitOid)

.then(function(baseCommit) {

if (baseCommit.toString() == fromCommitOid) {

// The commit we're merging to is already in our history.

// nothing to do so just return the commit the branch is on

return toCommitOid;

}

else if (baseCommit.toString() == toCommitOid &&

mergePreference !== NodeGit.Merge.PREFERENCE.NO_FASTFORWARD) {

// fast forward

var message =

"Fast forward branch " +

toBranch.shorthand() +

" to branch " +

fromBranch.shorthand();

return branchCommits[1].getTree()

.then(function(tree) {

if (toBranch.isHead()) {

// Checkout the tree if we're on the branch

var opts = {

checkoutStrategy: NodeGit.Checkout.STRATEGY.SAFE |

NodeGit.Checkout.STRATEGY.RECREATE_MISSING

};

return NodeGit.Checkout.tree(repo, tree, opts);

}

})

.then(function() {

return toBranch.setTarget(

fromCommitOid,

message)

.then(function() {

return fromCommitOid;

});

}

else if (mergePreference !== NodeGit.Merge.PREFERENCE.FASTFORWARD_ONLY) {

var updateHead;

// We have to merge. Lets do it!

return NodeGit.Reference.lookup(repo, "HEAD")

.then(function(headRef) {

return headRef.resolve();

})

.then(function(headRef) {

updateHead = !!headRef && (headRef.name() === toBranch.name());

return NodeGit.Merge.commits(

repo,

toCommitOid,

fromCommitOid,

mergeOptions

);

})

.then(function(index) {

// if we have conflicts then throw the index

if (index.hasConflicts()) {

throw index;

}

// No conflicts so just go ahead with the merge

return index.writeTreeTo(repo);

})

.then(function(oid) {

var message =

"Merged " +

fromBranch.shorthand() +

" into " +

toBranch.shorthand();

return repo.createCommit(

toBranch.name(),

signature,

message,

oid,

[toCommitOid, fromCommitOid]);

})

.then(function(commit) {

// we've updated the checked out branch, so make sure we update

// head so that our index isn't messed up

if (updateHead) {

return repo.getBranch(to)

.then(function(branch) {

return repo.getBranchCommit(branch);

})

.then(function(branchCommit) {

return branchCommit.getTree();

})

.then(function(tree) {

var opts = {

checkoutStrategy: NodeGit.Checkout.STRATEGY.SAFE |

NodeGit.Checkout.STRATEGY.RECREATE_MISSING

};

return NodeGit.Checkout.tree(repo, tree, opts);

})

.then(function() {

return commit;

});

}

else {

return commit;

}

});

}

else {

// A non fast-forwardable merge with ff-only

return toCommitOid;

}

});

};

/**

* Goes through a rebase's rebase operations and commits them if there are

* no merge conflicts

* @param {Repository} repository The repository that the rebase is being

* performed in

* @param {Rebase} rebase The current rebase being performed

* @param {Signature} signature Identity of the one performing the rebase

* @param {Function} beforeNextFn Callback to be called before each

* invocation of next(). If the callback

* returns a promise, the next() will be

* called when the promise resolves.

* @return {Int|Index} An error code for an unsuccesful rebase or an index for

* a rebase with conflicts

function performRebase(repository, rebase, signature, beforeNextFn) {

var beforeNextFnResult;

function getPromise() {

return rebase.next()

.then(function() {

return repository.refreshIndex()

.then(function(index) {

if (index.hasConflicts()) {

throw index;

}

rebase.commit(null, signature);

return performRebase(repository, rebase, signature, beforeNextFn);

});

}, function(error) {

if (error && error.errno === NodeGit.Error.CODE.ITEROVER) {

return rebase.finish(signature);

} else {

throw error;

}

});

}

if(beforeNextFn) {

beforeNextFnResult = beforeNextFn(rebase);

// if beforeNextFn returns a promise, chain the promise

return Promise.resolve(beforeNextFnResult)

.then(getPromise);

}

return getPromise();

}

/**

* Rebases a branch onto another branch

* @async

* @param {String} branch

* @param {String} upstream

* @param {String} onto

* @param {Signature} signature Identity of the one performing the rebase

* @param {Function} beforeNextFn Callback to be called before each step

* of the rebase. If the callback returns a

* promise, the rebase will resume when the

* promise resolves. The rebase object is

* is passed to the callback.

* @return {Oid|Index} A commit id for a succesful merge or an index for a

* rebase with conflicts

Repository.prototype.rebaseBranches = function(

branch,

upstream,

onto,

signature,

beforeNextFn

)

{

var repo = this;

var branchCommit;

var upstreamCommit;

var ontoCommit;

signature = signature || repo.defaultSignature();

return Promise.all([

repo.getReference(branch),

upstream ? repo.getReference(upstream) : null,

onto ? repo.getReference(onto) : null

])

.then(function(refs) {

return Promise.all([

View remainder of file in raw view

nodegit/lib/repository.js at update-libgit2-head · enicky/nodegit · GitHub

Repository navigation

Expand file tree

Breadcrumbs

repository.js

Latest commit

History

Breadcrumbs

repository.js

File metadata and controls