This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3086

pull: pass rev to check out as integer to postincoming()
ClosedPublic

Authored by martinvonz on Apr 4 2018, 6:53 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd5e1678026fd: pull: pass rev to check out as integer to postincoming()
Summary

I don't know if there's ever been a need for it to be a string (it's
been like that since 02f40b2ece3f (commands: use rev from remote repo
when updating as part of a pull, 2009-10-21)). I'm soon going to
require it to be an integer, so let's fix this first.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)

Diff 7717

mercurial/commands.py

opargs=pullopargs).cgresult opargs=pullopargs).cgresult
# brev is a name, which might be a bookmark to be activated at # brev is a name, which might be a bookmark to be activated at
# the end of the update. In other words, it is an explicit # the end of the update. In other words, it is an explicit
# destination of the update # destination of the update
brev = None brev = None
if checkout: if checkout:
checkout = "%d" % repo.changelog.rev(checkout) checkout = repo.changelog.rev(checkout)
# order below depends on implementation of # order below depends on implementation of
# hg.addbranchrevs(). opts['bookmark'] is ignored, # hg.addbranchrevs(). opts['bookmark'] is ignored,
# because 'checkout' is determined without it. # because 'checkout' is determined without it.
if opts.get('rev'): if opts.get('rev'):
brev = opts['rev'][0] brev = opts['rev'][0]
elif opts.get('branch'): elif opts.get('branch'):
brev = opts['branch'][0] brev = opts['branch'][0]