Mercurial > public > mercurial-scm > hg

comparison hgext/rebase.py @ 32249:27e67cfea27f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: rename "target" to "destination" in messages The help text for rebase calls it "the destination" (never "target"), so let's use that in messages as well.
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 11 May 2017 22:38:15 -0700
parents b47e6b0ba6ca
children 78496ac30025
comparison
equal deleted inserted replaced
32248:b47e6b0ba6ca 32249:27e67cfea27f
903 # Update to destination and merge it with local 903 # Update to destination and merge it with local
904 if repo['.'].rev() != p1: 904 if repo['.'].rev() != p1:
905 repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1])) 905 repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))
906 mergemod.update(repo, p1, False, True) 906 mergemod.update(repo, p1, False, True)
907 else: 907 else:
908 repo.ui.debug(" already in target\n") 908 repo.ui.debug(" already in destination\n")
909 repo.dirstate.write(repo.currenttransaction()) 909 repo.dirstate.write(repo.currenttransaction())
910 repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev])) 910 repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))
911 if base is not None: 911 if base is not None:
912 repo.ui.debug(" detach base %d:%s\n" % (base, repo[base])) 912 repo.ui.debug(" detach base %d:%s\n" % (base, repo[base]))
913 # When collapsing in-place, the parent is the common ancestor, we 913 # When collapsing in-place, the parent is the common ancestor, we
1189 1189
1190 descendants = set() 1190 descendants = set()
1191 if dstates: 1191 if dstates:
1192 descendants = set(repo.changelog.descendants(dstates)) 1192 descendants = set(repo.changelog.descendants(dstates))
1193 if descendants - set(dstates): 1193 if descendants - set(dstates):
1194 repo.ui.warn(_("warning: new changesets detected on target branch, " 1194 repo.ui.warn(_("warning: new changesets detected on destination "
1195 "can't strip\n")) 1195 "branch, can't strip\n"))
1196 cleanup = False 1196 cleanup = False
1197 1197
1198 if cleanup: 1198 if cleanup:
1199 shouldupdate = False 1199 shouldupdate = False
1200 rebased = filter(lambda x: x >= 0 and x != dest, state.values()) 1200 rebased = filter(lambda x: x >= 0 and x != dest, state.values())