Show More
@@ -68,7 +68,7 b" def fetch(ui, repo, source='default', **" | |||||
68 | if date: |
|
68 | if date: | |
69 | opts['date'] = dateutil.parsedate(date) |
|
69 | opts['date'] = dateutil.parsedate(date) | |
70 |
|
70 | |||
71 |
parent |
|
71 | parent = repo.dirstate.p1() | |
72 | branch = repo.dirstate.branch() |
|
72 | branch = repo.dirstate.branch() | |
73 | try: |
|
73 | try: | |
74 | branchnode = repo.branchtip(branch) |
|
74 | branchnode = repo.branchtip(branch) |
@@ -1459,7 +1459,7 b' def _chistedit(ui, repo, *freeargs, **op' | |||||
1459 | 'exactly one common root')) |
|
1459 | 'exactly one common root')) | |
1460 | root = rr[0].node() |
|
1460 | root = rr[0].node() | |
1461 |
|
1461 | |||
1462 |
topmost |
|
1462 | topmost = repo.dirstate.p1() | |
1463 | revs = between(repo, root, topmost, keep) |
|
1463 | revs = between(repo, root, topmost, keep) | |
1464 | if not revs: |
|
1464 | if not revs: | |
1465 | raise error.Abort(_('%s is not an ancestor of working directory') % |
|
1465 | raise error.Abort(_('%s is not an ancestor of working directory') % | |
@@ -1873,7 +1873,7 b' def _newhistedit(ui, repo, state, revs, ' | |||||
1873 | cmdutil.checkunfinished(repo) |
|
1873 | cmdutil.checkunfinished(repo) | |
1874 | cmdutil.bailifchanged(repo) |
|
1874 | cmdutil.bailifchanged(repo) | |
1875 |
|
1875 | |||
1876 |
topmost |
|
1876 | topmost = repo.dirstate.p1() | |
1877 | if outg: |
|
1877 | if outg: | |
1878 | if freeargs: |
|
1878 | if freeargs: | |
1879 | remote = freeargs[0] |
|
1879 | remote = freeargs[0] |
@@ -970,7 +970,7 b' class queue(object):' | |||||
970 | repo.dirstate.remove(f) |
|
970 | repo.dirstate.remove(f) | |
971 | for f in merged: |
|
971 | for f in merged: | |
972 | repo.dirstate.merge(f) |
|
972 | repo.dirstate.merge(f) | |
973 |
p1 |
|
973 | p1 = repo.dirstate.p1() | |
974 | repo.setparents(p1, merge) |
|
974 | repo.setparents(p1, merge) | |
975 |
|
975 | |||
976 | if all_files and '.hgsubstate' in all_files: |
|
976 | if all_files and '.hgsubstate' in all_files: |
@@ -155,7 +155,7 b' class transplanter(object):' | |||||
155 | if opts is None: |
|
155 | if opts is None: | |
156 | opts = {} |
|
156 | opts = {} | |
157 | revs = sorted(revmap) |
|
157 | revs = sorted(revmap) | |
158 |
p1 |
|
158 | p1 = repo.dirstate.p1() | |
159 | pulls = [] |
|
159 | pulls = [] | |
160 | diffopts = patch.difffeatureopts(self.ui, opts) |
|
160 | diffopts = patch.difffeatureopts(self.ui, opts) | |
161 | diffopts.git = True |
|
161 | diffopts.git = True | |
@@ -186,7 +186,7 b' class transplanter(object):' | |||||
186 | exchange.pull(repo, source.peer(), heads=pulls) |
|
186 | exchange.pull(repo, source.peer(), heads=pulls) | |
187 | merge.update(repo, pulls[-1], branchmerge=False, |
|
187 | merge.update(repo, pulls[-1], branchmerge=False, | |
188 | force=False) |
|
188 | force=False) | |
189 |
p1 |
|
189 | p1 = repo.dirstate.p1() | |
190 | pulls = [] |
|
190 | pulls = [] | |
191 |
|
191 | |||
192 | domerge = False |
|
192 | domerge = False | |
@@ -323,7 +323,7 b' class transplanter(object):' | |||||
323 | else: |
|
323 | else: | |
324 | files = None |
|
324 | files = None | |
325 | if merge: |
|
325 | if merge: | |
326 |
p1 |
|
326 | p1 = repo.dirstate.p1() | |
327 | repo.setparents(p1, node) |
|
327 | repo.setparents(p1, node) | |
328 | m = match.always(repo.root, '') |
|
328 | m = match.always(repo.root, '') | |
329 | else: |
|
329 | else: | |
@@ -387,7 +387,7 b' class transplanter(object):' | |||||
387 |
|
387 | |||
388 | extra = {'transplant_source': node} |
|
388 | extra = {'transplant_source': node} | |
389 | try: |
|
389 | try: | |
390 |
p1 |
|
390 | p1 = repo.dirstate.p1() | |
391 | if p1 != parent: |
|
391 | if p1 != parent: | |
392 | raise error.Abort(_('working directory not at transplant ' |
|
392 | raise error.Abort(_('working directory not at transplant ' | |
393 | 'parent %s') % nodemod.hex(parent)) |
|
393 | 'parent %s') % nodemod.hex(parent)) | |
@@ -668,7 +668,7 b' def _dotransplant(ui, repo, *revs, **opt' | |||||
668 |
|
668 | |||
669 | tp = transplanter(ui, repo, opts) |
|
669 | tp = transplanter(ui, repo, opts) | |
670 |
|
670 | |||
671 |
p1 |
|
671 | p1 = repo.dirstate.p1() | |
672 | if len(repo) > 0 and p1 == revlog.nullid: |
|
672 | if len(repo) > 0 and p1 == revlog.nullid: | |
673 | raise error.Abort(_('no revision checked out')) |
|
673 | raise error.Abort(_('no revision checked out')) | |
674 | if opts.get('continue'): |
|
674 | if opts.get('continue'): |
General Comments 0
You need to be logged in to leave comments.
Login now