hg-git: hggit/__init_

annotate hggit/init.py @ 924:7c80e9f8131f

init: fix default hg breakage by returning the right type Originally, I copied the logic for the file scheme which calls _peerlookup(path) but in mercurial/hg.py they have: try: return thing(path) except TypeError: return thing So, our http(s) scheme broke default Mercurial because I tried returning thing(path) instead of just thing. A test has been added to catch this.

author	Sean Farley <sean@farley.io>
date	Fri, 17 Jul 2015 11:25:00 -0700
parents	e28affca64de
children	e183fdc198f0

rev	line source
0 06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	1 # git.py - git server bridge
06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	2 #
06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	3 # Copyright 2008 Scott Chacon <schacon at gmail dot com>
250 b9c94c21777e Add some better help. Augie Fackler <durin42@gmail.com> parents: 220 diff changeset	4 # also some code (and help) borrowed from durin42
0 06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	5 #
06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	6 # This software may be used and distributed according to the terms
06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	7 # of the GNU General Public License, incorporated herein by reference.
06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	8
06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	9 '''push and pull from a Git server
06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	10
06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	11 This extension lets you communicate (push and pull) with a Git server.
250 b9c94c21777e Add some better help. Augie Fackler <durin42@gmail.com> parents: 220 diff changeset	12 This way you can use Git hosting for your project or collaborate with a
0 06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	13 project that is in Git. A bridger of worlds, this plugin be.
06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	14
250 b9c94c21777e Add some better help. Augie Fackler <durin42@gmail.com> parents: 220 diff changeset	15 Try hg clone git:// or hg clone git+ssh://
481 9df1741f3977 help: add additional help topics David M. Carr <david@carrclan.us> parents: 442 diff changeset	16
9df1741f3977 help: add additional help topics David M. Carr <david@carrclan.us> parents: 442 diff changeset	17 For more information and instructions, see :hg:`help git`
0 06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	18 '''
06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	19
918 f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	20 # global modules
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	21 import os
912 5cc9594cc811 Add version info to hggit for "hg --version -v" anatoly techtonik <techtonik@gmail.com> parents: 909 diff changeset	22
918 f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	23 # local modules
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	24 import gitrepo
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	25 import hgrepo
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	26 import overlay
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	27 import verify
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	28 import util
912 5cc9594cc811 Add version info to hggit for "hg --version -v" anatoly techtonik <techtonik@gmail.com> parents: 909 diff changeset	29
481 9df1741f3977 help: add additional help topics David M. Carr <david@carrclan.us> parents: 442 diff changeset	30 from bisect import insort
918 f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	31 from git_handler import GitHandler
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 389 diff changeset	32 from mercurial import bundlerepo
732 a67fecf02adb commands: switch to new-style declaration via decorators Siddharth Agarwal <sid0@fb.com> parents: 731 diff changeset	33 from mercurial import cmdutil
362 5b6961384ee2 demandimport: defend against collections breakage in new dulwich Augie Fackler <durin42@gmail.com> parents: 352 diff changeset	34 from mercurial import demandimport
615 503d403fc040 Fix for #68 \| Use .gitignore files (with proper semantics) Ben Kehoe <benk@berkeley.edu> parents: 556 diff changeset	35 from mercurial import dirstate
523 8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	36 from mercurial import discovery
918 f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	37 from mercurial import extensions
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	38 from mercurial import help
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	39 from mercurial import hg
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	40 from mercurial import localrepo
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	41 from mercurial import manifest
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	42 from mercurial import revset
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	43 from mercurial import scmutil
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	44 from mercurial import templatekw
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	45 from mercurial import util as hgutil
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	46 from mercurial.node import hex
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	47 from mercurial.i18n import _
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	48
782 e5450a81676e __init__: work around exchange not yet existing in hg 2.8.x Augie Fackler <raf@durin42.com> parents: 781 diff changeset	49 try:
e5450a81676e __init__: work around exchange not yet existing in hg 2.8.x Augie Fackler <raf@durin42.com> parents: 781 diff changeset	50 from mercurial import exchange
887 8f9d52f7942e init: whitespace and formating cleanup Sean Farley <sean@farley.io> parents: 857 diff changeset	51 exchange.push # existed in first iteration of this file
782 e5450a81676e __init__: work around exchange not yet existing in hg 2.8.x Augie Fackler <raf@durin42.com> parents: 781 diff changeset	52 except ImportError:
e5450a81676e __init__: work around exchange not yet existing in hg 2.8.x Augie Fackler <raf@durin42.com> parents: 781 diff changeset	53 # We only use the exchange module in hg 3.2+, so this is safe
e5450a81676e __init__: work around exchange not yet existing in hg 2.8.x Augie Fackler <raf@durin42.com> parents: 781 diff changeset	54 pass
918 f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	55
907 e5b10a710036 ignore: update ignore logic to match upstream Durham Goode <durham@fb.com> parents: 901 diff changeset	56 try:
e5b10a710036 ignore: update ignore logic to match upstream Durham Goode <durham@fb.com> parents: 901 diff changeset	57 from mercurial import ignore
909 67b27ec080ae ignore: evaluate ignore.readpats to see if ignore module really exists Yuya Nishihara <yuya@tcha.org> parents: 907 diff changeset	58 ignore.readpats
907 e5b10a710036 ignore: update ignore logic to match upstream Durham Goode <durham@fb.com> parents: 901 diff changeset	59 ignoremod = True
e5b10a710036 ignore: update ignore logic to match upstream Durham Goode <durham@fb.com> parents: 901 diff changeset	60 except ImportError:
e5b10a710036 ignore: update ignore logic to match upstream Durham Goode <durham@fb.com> parents: 901 diff changeset	61 # The ignore module disappeared in Mercurial 3.5
e5b10a710036 ignore: update ignore logic to match upstream Durham Goode <durham@fb.com> parents: 901 diff changeset	62 ignoremod = False
887 8f9d52f7942e init: whitespace and formating cleanup Sean Farley <sean@farley.io> parents: 857 diff changeset	63
362 5b6961384ee2 demandimport: defend against collections breakage in new dulwich Augie Fackler <durin42@gmail.com> parents: 352 diff changeset	64 demandimport.ignore.extend([
5b6961384ee2 demandimport: defend against collections breakage in new dulwich Augie Fackler <durin42@gmail.com> parents: 352 diff changeset	65 'collections',
887 8f9d52f7942e init: whitespace and formating cleanup Sean Farley <sean@farley.io> parents: 857 diff changeset	66 ])
0 06366111af3c initial import of the hg-git bridging extension for mercurial Scott Chacon <schacon@gmail.com> parents: diff changeset	67
918 f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	68 __version__ = '0.8.1'
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	69
901 49831f78c412 init: mark hg-git as compatible with Mercurial 3.4 Siddharth Agarwal <sid0@fb.com> parents: 899 diff changeset	70 testedwith = '2.8.2 3.0.1 3.1 3.2.2 3.3 3.4'
545 22b8df4c54c5 docs: include buglink David M. Carr <david@carrclan.us> parents: 523 diff changeset	71 buglink = 'https://bitbucket.org/durin42/hg-git/issues'
22b8df4c54c5 docs: include buglink David M. Carr <david@carrclan.us> parents: 523 diff changeset	72
732 a67fecf02adb commands: switch to new-style declaration via decorators Siddharth Agarwal <sid0@fb.com> parents: 731 diff changeset	73 cmdtable = {}
a67fecf02adb commands: switch to new-style declaration via decorators Siddharth Agarwal <sid0@fb.com> parents: 731 diff changeset	74 command = cmdutil.command(cmdtable)
a67fecf02adb commands: switch to new-style declaration via decorators Siddharth Agarwal <sid0@fb.com> parents: 731 diff changeset	75
60 05a96f7750ad add support for `hg clone git://github.com/defunkt/facebox.git` Chris Wanstrath <chris@ozmm.org> parents: 59 diff changeset	76 # support for `hg clone git://github.com/defunkt/facebox.git`
168 8bfa8aa6b68f added empty changelog handling Scott Chacon <schacon@gmail.com> parents: 165 diff changeset	77 # also hg clone git+ssh://git@github.com/schacon/simplegit.git
919 6507d2a6be0a util: add heuristic method to determine if a uri is git Sean Farley <sean@farley.io> parents: 918 diff changeset	78 for _scheme in util.gitschemes:
439 3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 430 diff changeset	79 hg.schemes[_scheme] = gitrepo
180 682863000e9a Make it possible to clone/pull from bundle repositories Abderrahim Kitouni <a.kitouni@gmail.com> parents: 175 diff changeset	80
256 442fe2ca104d Simpler handling of detection of git repos Mads Kiilerich <mads@kiilerich.com> parents: 220 diff changeset	81 # support for `hg clone localgitrepo`
220 211fa793d74f support local git repositories (fixes issue 5 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 210 diff changeset	82 _oldlocal = hg.schemes['file']
211fa793d74f support local git repositories (fixes issue 5 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 210 diff changeset	83
388 bcc79fa3fe09 url wasn't ever published as url.url, and is now util.url Augie Fackler <durin42@gmail.com> parents: 383 diff changeset	84 try:
bcc79fa3fe09 url wasn't ever published as url.url, and is now util.url Augie Fackler <durin42@gmail.com> parents: 383 diff changeset	85 urlcls = hgutil.url
bcc79fa3fe09 url wasn't ever published as url.url, and is now util.url Augie Fackler <durin42@gmail.com> parents: 383 diff changeset	86 except AttributeError:
bcc79fa3fe09 url wasn't ever published as url.url, and is now util.url Augie Fackler <durin42@gmail.com> parents: 383 diff changeset	87 class urlcls(object):
bcc79fa3fe09 url wasn't ever published as url.url, and is now util.url Augie Fackler <durin42@gmail.com> parents: 383 diff changeset	88 def __init__(self, path):
bcc79fa3fe09 url wasn't ever published as url.url, and is now util.url Augie Fackler <durin42@gmail.com> parents: 383 diff changeset	89 self.p = hgutil.drop_scheme('file', path)
bcc79fa3fe09 url wasn't ever published as url.url, and is now util.url Augie Fackler <durin42@gmail.com> parents: 383 diff changeset	90
bcc79fa3fe09 url wasn't ever published as url.url, and is now util.url Augie Fackler <durin42@gmail.com> parents: 383 diff changeset	91 def localpath(self):
bcc79fa3fe09 url wasn't ever published as url.url, and is now util.url Augie Fackler <durin42@gmail.com> parents: 383 diff changeset	92 return self.p
bcc79fa3fe09 url wasn't ever published as url.url, and is now util.url Augie Fackler <durin42@gmail.com> parents: 383 diff changeset	93
220 211fa793d74f support local git repositories (fixes issue 5 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 210 diff changeset	94 def _local(path):
388 bcc79fa3fe09 url wasn't ever published as url.url, and is now util.url Augie Fackler <durin42@gmail.com> parents: 383 diff changeset	95 p = urlcls(path).localpath()
280 d0594f7675e1 init: whitespace cleanup Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	96 if (os.path.exists(os.path.join(p, '.git')) and
256 442fe2ca104d Simpler handling of detection of git repos Mads Kiilerich <mads@kiilerich.com> parents: 220 diff changeset	97 not os.path.exists(os.path.join(p, '.hg'))):
220 211fa793d74f support local git repositories (fixes issue 5 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 210 diff changeset	98 return gitrepo
263 9f5a7a5d52aa Enable detection of bare repositories as a local git repo Lincoln Stoll <lstoll@lstoll.net> parents: 260 diff changeset	99 # detect a bare repository
280 d0594f7675e1 init: whitespace cleanup Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	100 if (os.path.exists(os.path.join(p, 'HEAD')) and
d0594f7675e1 init: whitespace cleanup Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	101 os.path.exists(os.path.join(p, 'objects')) and
d0594f7675e1 init: whitespace cleanup Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	102 os.path.exists(os.path.join(p, 'refs')) and
263 9f5a7a5d52aa Enable detection of bare repositories as a local git repo Lincoln Stoll <lstoll@lstoll.net> parents: 260 diff changeset	103 not os.path.exists(os.path.join(p, '.hg'))):
9f5a7a5d52aa Enable detection of bare repositories as a local git repo Lincoln Stoll <lstoll@lstoll.net> parents: 260 diff changeset	104 return gitrepo
922 ee9017a3c269 init: test for raw git ssh paths Sean Farley <sean@farley.io> parents: 919 diff changeset	105 # detect git ssh urls (which mercurial thinks is a file-like path)
ee9017a3c269 init: test for raw git ssh paths Sean Farley <sean@farley.io> parents: 919 diff changeset	106 if util.isgitsshuri(p):
ee9017a3c269 init: test for raw git ssh paths Sean Farley <sean@farley.io> parents: 919 diff changeset	107 return gitrepo
256 442fe2ca104d Simpler handling of detection of git repos Mads Kiilerich <mads@kiilerich.com> parents: 220 diff changeset	108 return _oldlocal(path)
220 211fa793d74f support local git repositories (fixes issue 5 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 210 diff changeset	109
211fa793d74f support local git repositories (fixes issue 5 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 210 diff changeset	110 hg.schemes['file'] = _local
211fa793d74f support local git repositories (fixes issue 5 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 210 diff changeset	111
923 e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	112 def _httpgitwrapper(orig):
e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	113 # we should probably test the connection but for now, we just keep it
e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	114 # simple and check for a url ending in '.git'
e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	115 def httpgitscheme(uri):
e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	116 if uri.endswith('.git'):
e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	117 return gitrepo
e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	118
924 7c80e9f8131f init: fix default hg breakage by returning the right type Sean Farley <sean@farley.io> parents: 923 diff changeset	119 # the http(s) scheme just returns the _peerlookup
7c80e9f8131f init: fix default hg breakage by returning the right type Sean Farley <sean@farley.io> parents: 923 diff changeset	120 return orig
923 e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	121
e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	122 return httpgitscheme
e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	123
e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	124 hg.schemes['https'] = _httpgitwrapper(hg.schemes['https'])
e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	125 hg.schemes['http'] = _httpgitwrapper(hg.schemes['http'])
e28affca64de init: test for git http(s) paths Sean Farley <sean@farley.io> parents: 922 diff changeset	126
281 a14529b7b8f2 init: strip .git for default clone destination for git sources Augie Fackler <durin42@gmail.com> parents: 280 diff changeset	127 hgdefaultdest = hg.defaultdest
a14529b7b8f2 init: strip .git for default clone destination for git sources Augie Fackler <durin42@gmail.com> parents: 280 diff changeset	128 def defaultdest(source):
919 6507d2a6be0a util: add heuristic method to determine if a uri is git Sean Farley <sean@farley.io> parents: 918 diff changeset	129 for scheme in util.gitschemes:
281 a14529b7b8f2 init: strip .git for default clone destination for git sources Augie Fackler <durin42@gmail.com> parents: 280 diff changeset	130 if source.startswith('%s://' % scheme) and source.endswith('.git'):
919 6507d2a6be0a util: add heuristic method to determine if a uri is git Sean Farley <sean@farley.io> parents: 918 diff changeset	131 return hgdefaultdest(source[:-4])
6507d2a6be0a util: add heuristic method to determine if a uri is git Sean Farley <sean@farley.io> parents: 918 diff changeset	132
6507d2a6be0a util: add heuristic method to determine if a uri is git Sean Farley <sean@farley.io> parents: 918 diff changeset	133 if source.endswith('.git'):
6507d2a6be0a util: add heuristic method to determine if a uri is git Sean Farley <sean@farley.io> parents: 918 diff changeset	134 return hgdefaultdest(source[:-4])
6507d2a6be0a util: add heuristic method to determine if a uri is git Sean Farley <sean@farley.io> parents: 918 diff changeset	135
281 a14529b7b8f2 init: strip .git for default clone destination for git sources Augie Fackler <durin42@gmail.com> parents: 280 diff changeset	136 return hgdefaultdest(source)
a14529b7b8f2 init: strip .git for default clone destination for git sources Augie Fackler <durin42@gmail.com> parents: 280 diff changeset	137 hg.defaultdest = defaultdest
a14529b7b8f2 init: strip .git for default clone destination for git sources Augie Fackler <durin42@gmail.com> parents: 280 diff changeset	138
918 f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	139 def getversion():
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	140 """return version with dependencies for hg --version -v"""
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	141 import dulwich
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	142 dulver = '.'.join(str(i) for i in dulwich.__version__)
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	143 return __version__ + (" (dulwich %s)" % dulver)
f5dc1730e4d3 init: sort imports and clean up pep warnings Sean Farley <sean@farley.io> parents: 913 diff changeset	144
297 a90fe3e8a8c3 hggit: defend against exceptions when pulling with -r Augie Fackler <durin42@gmail.com> parents: 296 diff changeset	145 # defend against tracebacks if we specify -r in 'hg pull'
a90fe3e8a8c3 hggit: defend against exceptions when pulling with -r Augie Fackler <durin42@gmail.com> parents: 296 diff changeset	146 def safebranchrevs(orig, lrepo, repo, branches, revs):
a90fe3e8a8c3 hggit: defend against exceptions when pulling with -r Augie Fackler <durin42@gmail.com> parents: 296 diff changeset	147 revs, co = orig(lrepo, repo, branches, revs)
706 5e74edb7a62d safebranchrevs: handle changelog having no commits Siddharth Agarwal <sid0@fb.com> parents: 695 diff changeset	148 if hgutil.safehasattr(lrepo, 'changelog') and co not in lrepo.changelog:
297 a90fe3e8a8c3 hggit: defend against exceptions when pulling with -r Augie Fackler <durin42@gmail.com> parents: 296 diff changeset	149 co = None
a90fe3e8a8c3 hggit: defend against exceptions when pulling with -r Augie Fackler <durin42@gmail.com> parents: 296 diff changeset	150 return revs, co
300 eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	151 if getattr(hg, 'addbranchrevs', False):
eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	152 extensions.wrapfunction(hg, 'addbranchrevs', safebranchrevs)
297 a90fe3e8a8c3 hggit: defend against exceptions when pulling with -r Augie Fackler <durin42@gmail.com> parents: 296 diff changeset	153
695 2c67099875cd extsetup: use new-style extsetup with ui parameter Siddharth Agarwal <sid0@fb.com> parents: 693 diff changeset	154 def extsetup(ui):
482 00d591868a2f templatekw: add support for gitnode template keyword David M. Carr <david@carrclan.us> parents: 481 diff changeset	155 templatekw.keywords.update({'gitnode': gitnodekw})
483 d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	156 revset.symbols.update({
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	157 'fromgit': revset_fromgit, 'gitnode': revset_gitnode
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	158 })
481 9df1741f3977 help: add additional help topics David M. Carr <david@carrclan.us> parents: 442 diff changeset	159 helpdir = os.path.join(os.path.dirname(__file__), 'help')
9df1741f3977 help: add additional help topics David M. Carr <david@carrclan.us> parents: 442 diff changeset	160 entry = (['git'], _("Working with Git Repositories"),
887 8f9d52f7942e init: whitespace and formating cleanup Sean Farley <sean@farley.io> parents: 857 diff changeset	161 lambda: open(os.path.join(helpdir, 'git.rst')).read())
675 4cb3515cefb0 extsetup: drop support for Mercurial < 1.7 Siddharth Agarwal <sid0@fb.com> parents: 674 diff changeset	162 insort(help.helptable, entry)
481 9df1741f3977 help: add additional help topics David M. Carr <david@carrclan.us> parents: 442 diff changeset	163
206 5986ac6a591e create the repository subclass in reposetup Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	164 def reposetup(ui, repo):
296 32456f9cb7a4 hggit: don't wrap gitrepo with hgrepo Augie Fackler <durin42@gmail.com> parents: 281 diff changeset	165 if not isinstance(repo, gitrepo.gitrepo):
32456f9cb7a4 hggit: don't wrap gitrepo with hgrepo Augie Fackler <durin42@gmail.com> parents: 281 diff changeset	166 klass = hgrepo.generate_repo_subclass(repo.__class__)
32456f9cb7a4 hggit: don't wrap gitrepo with hgrepo Augie Fackler <durin42@gmail.com> parents: 281 diff changeset	167 repo.__class__ = klass
60 05a96f7750ad add support for `hg clone git://github.com/defunkt/facebox.git` Chris Wanstrath <chris@ozmm.org> parents: 59 diff changeset	168
899 11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 897 diff changeset	169 if hgutil.safehasattr(manifest, '_lazymanifest'):
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 897 diff changeset	170 # Mercurial >= 3.4
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 897 diff changeset	171 extensions.wrapfunction(manifest.manifestdict, 'diff',
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 897 diff changeset	172 overlay.wrapmanifestdictdiff)
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 897 diff changeset	173
733 5e53342c846b gimport: drop empty options and redundant synopsis, and add help text Siddharth Agarwal <sid0@fb.com> parents: 732 diff changeset	174 @command('gimport')
137 5aefcbf1e50c add a gimport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 136 diff changeset	175 def gimport(ui, repo, remote_name=None):
733 5e53342c846b gimport: drop empty options and redundant synopsis, and add help text Siddharth Agarwal <sid0@fb.com> parents: 732 diff changeset	176 '''import commits from Git to Mercurial'''
663 ad0d90fa7a4f gimport: use githandler from repo Siddharth Agarwal <sid0@fb.com> parents: 624 diff changeset	177 repo.githandler.import_commits(remote_name)
137 5aefcbf1e50c add a gimport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 136 diff changeset	178
734 351213785c4a gexport: drop empty options and redundant synopsis, and add help text Siddharth Agarwal <sid0@fb.com> parents: 733 diff changeset	179 @command('gexport')
97 f0628f5270b6 add gexport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 63 diff changeset	180 def gexport(ui, repo):
734 351213785c4a gexport: drop empty options and redundant synopsis, and add help text Siddharth Agarwal <sid0@fb.com> parents: 733 diff changeset	181 '''export commits from Mercurial to Git'''
664 570c3702b916 gexport: use githandler from repo Siddharth Agarwal <sid0@fb.com> parents: 663 diff changeset	182 repo.githandler.export_commits()
97 f0628f5270b6 add gexport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 63 diff changeset	183
735 b48be97bd6fd gclear: drop empty options and move help text to docstring Siddharth Agarwal <sid0@fb.com> parents: 734 diff changeset	184 @command('gclear')
40 f5b000ec7100 added gclear command to remove all the git data Scott Chacon <schacon@gmail.com> parents: 39 diff changeset	185 def gclear(ui, repo):
735 b48be97bd6fd gclear: drop empty options and move help text to docstring Siddharth Agarwal <sid0@fb.com> parents: 734 diff changeset	186 '''clear out the Git cached data'''
40 f5b000ec7100 added gclear command to remove all the git data Scott Chacon <schacon@gmail.com> parents: 39 diff changeset	187 repo.ui.status(_("clearing out the git cache data\n"))
665 2659f63f0beb gclear: use githandler from repo Siddharth Agarwal <sid0@fb.com> parents: 664 diff changeset	188 repo.githandler.clear()
622 6faa5b0f8909 gitignore: gate feature on dirstate having rootcache and ignore having readpats Augie Fackler <raf@durin42.com> parents: 615 diff changeset	189
732 a67fecf02adb commands: switch to new-style declaration via decorators Siddharth Agarwal <sid0@fb.com> parents: 731 diff changeset	190 @command('gverify',
a67fecf02adb commands: switch to new-style declaration via decorators Siddharth Agarwal <sid0@fb.com> parents: 731 diff changeset	191 [('r', 'rev', '', _('revision to verify'), _('REV'))],
a67fecf02adb commands: switch to new-style declaration via decorators Siddharth Agarwal <sid0@fb.com> parents: 731 diff changeset	192 _('[-r REV]'))
731 705f0a2a7c18 verify: add a wrapper function in __init__.py Siddharth Agarwal <sid0@fb.com> parents: 730 diff changeset	193 def gverify(ui, repo, **opts):
705f0a2a7c18 verify: add a wrapper function in __init__.py Siddharth Agarwal <sid0@fb.com> parents: 730 diff changeset	194 '''verify that a Mercurial rev matches the corresponding Git rev
705f0a2a7c18 verify: add a wrapper function in __init__.py Siddharth Agarwal <sid0@fb.com> parents: 730 diff changeset	195
705f0a2a7c18 verify: add a wrapper function in __init__.py Siddharth Agarwal <sid0@fb.com> parents: 730 diff changeset	196 Given a Mercurial revision that has a corresponding Git revision in the map,
705f0a2a7c18 verify: add a wrapper function in __init__.py Siddharth Agarwal <sid0@fb.com> parents: 730 diff changeset	197 this attempts to answer whether that revision has the same contents as the
705f0a2a7c18 verify: add a wrapper function in __init__.py Siddharth Agarwal <sid0@fb.com> parents: 730 diff changeset	198 corresponding Git revision.
705f0a2a7c18 verify: add a wrapper function in __init__.py Siddharth Agarwal <sid0@fb.com> parents: 730 diff changeset	199
705f0a2a7c18 verify: add a wrapper function in __init__.py Siddharth Agarwal <sid0@fb.com> parents: 730 diff changeset	200 '''
705f0a2a7c18 verify: add a wrapper function in __init__.py Siddharth Agarwal <sid0@fb.com> parents: 730 diff changeset	201 ctx = scmutil.revsingle(repo, opts.get('rev'), '.')
705f0a2a7c18 verify: add a wrapper function in __init__.py Siddharth Agarwal <sid0@fb.com> parents: 730 diff changeset	202 return verify.verify(ui, repo, ctx)
705f0a2a7c18 verify: add a wrapper function in __init__.py Siddharth Agarwal <sid0@fb.com> parents: 730 diff changeset	203
622 6faa5b0f8909 gitignore: gate feature on dirstate having rootcache and ignore having readpats Augie Fackler <raf@durin42.com> parents: 615 diff changeset	204 if (getattr(dirstate, 'rootcache', False) and
907 e5b10a710036 ignore: update ignore logic to match upstream Durham Goode <durham@fb.com> parents: 901 diff changeset	205 (not ignoremod or getattr(ignore, 'readpats', False))):
622 6faa5b0f8909 gitignore: gate feature on dirstate having rootcache and ignore having readpats Augie Fackler <raf@durin42.com> parents: 615 diff changeset	206 # only install our dirstate wrapper if it has a hope of working
6faa5b0f8909 gitignore: gate feature on dirstate having rootcache and ignore having readpats Augie Fackler <raf@durin42.com> parents: 615 diff changeset	207 import gitdirstate
907 e5b10a710036 ignore: update ignore logic to match upstream Durham Goode <durham@fb.com> parents: 901 diff changeset	208 if ignoremod:
e5b10a710036 ignore: update ignore logic to match upstream Durham Goode <durham@fb.com> parents: 901 diff changeset	209 def ignorewrap(orig, args, *kwargs):
e5b10a710036 ignore: update ignore logic to match upstream Durham Goode <durham@fb.com> parents: 901 diff changeset	210 return gitdirstate.gignore(args, *kwargs)
e5b10a710036 ignore: update ignore logic to match upstream Durham Goode <durham@fb.com> parents: 901 diff changeset	211 extensions.wrapfunction(ignore, 'ignore', ignorewrap)
622 6faa5b0f8909 gitignore: gate feature on dirstate having rootcache and ignore having readpats Augie Fackler <raf@durin42.com> parents: 615 diff changeset	212 dirstate.dirstate = gitdirstate.gitdirstate
59 19d714ee9941 gfetch should access repo when printing, not dest_repo Chris Wanstrath <chris@ozmm.org> parents: 40 diff changeset	213
736 5d35a5c12b02 git-cleanup: drop empty options and move help text to docstring Siddharth Agarwal <sid0@fb.com> parents: 735 diff changeset	214 @command('git-cleanup')
298 6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs Augie Fackler <durin42@gmail.com> parents: 297 diff changeset	215 def git_cleanup(ui, repo):
736 5d35a5c12b02 git-cleanup: drop empty options and move help text to docstring Siddharth Agarwal <sid0@fb.com> parents: 735 diff changeset	216 '''clean up Git commit map after history editing'''
298 6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs Augie Fackler <durin42@gmail.com> parents: 297 diff changeset	217 new_map = []
768 4a9057b16f40 git_handler: rename mapfile to map_file for PEP8 compat Siddharth Agarwal <sid0@fb.com> parents: 754 diff changeset	218 for line in repo.opener(GitHandler.map_file):
298 6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs Augie Fackler <durin42@gmail.com> parents: 297 diff changeset	219 gitsha, hgsha = line.strip().split(' ', 1)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs Augie Fackler <durin42@gmail.com> parents: 297 diff changeset	220 if hgsha in repo:
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs Augie Fackler <durin42@gmail.com> parents: 297 diff changeset	221 new_map.append('%s %s\n' % (gitsha, hgsha))
768 4a9057b16f40 git_handler: rename mapfile to map_file for PEP8 compat Siddharth Agarwal <sid0@fb.com> parents: 754 diff changeset	222 f = repo.opener(GitHandler.map_file, 'wb')
298 6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs Augie Fackler <durin42@gmail.com> parents: 297 diff changeset	223 map(f.write, new_map)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs Augie Fackler <durin42@gmail.com> parents: 297 diff changeset	224 ui.status(_('git commit map cleaned\n'))
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs Augie Fackler <durin42@gmail.com> parents: 297 diff changeset	225
523 8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	226 def findcommonoutgoing(orig, repo, other, args, *kwargs):
8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	227 if isinstance(other, gitrepo.gitrepo):
666 27fefb7e7cec findcommonoutgoing: use githandler from repo Siddharth Agarwal <sid0@fb.com> parents: 665 diff changeset	228 heads = repo.githandler.get_refs(other.path)[0]
523 8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	229 kw = {}
8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	230 kw.update(kwargs)
8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	231 for val, k in zip(args,
887 8f9d52f7942e init: whitespace and formating cleanup Sean Farley <sean@farley.io> parents: 857 diff changeset	232 ('onlyheads', 'force', 'commoninc', 'portable')):
523 8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	233 kw[k] = val
8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	234 force = kw.get('force', False)
8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	235 commoninc = kw.get('commoninc', None)
8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	236 if commoninc is None:
887 8f9d52f7942e init: whitespace and formating cleanup Sean Farley <sean@farley.io> parents: 857 diff changeset	237 commoninc = discovery.findcommonincoming(repo, other, heads=heads,
8f9d52f7942e init: whitespace and formating cleanup Sean Farley <sean@farley.io> parents: 857 diff changeset	238 force=force)
523 8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	239 kw['commoninc'] = commoninc
8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	240 return orig(repo, other, **kw)
8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	241 return orig(repo, other, args, *kwargs)
8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 483 diff changeset	242 extensions.wrapfunction(discovery, 'findcommonoutgoing', findcommonoutgoing)
344 af48a5961432 Add just enough code to handle changes to cset discovery. Augie Fackler <durin42@gmail.com> parents: 334 diff changeset	243
412 5932586e6d43 Fix mercurial issue2855 Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	244 def getremotechanges(orig, ui, repo, other, args, *opts):
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 389 diff changeset	245 if isinstance(other, gitrepo.gitrepo):
424 d2c4333e5f14 getremotechanges: fix incoming support Augie Fackler <durin42@gmail.com> parents: 412 diff changeset	246 if args:
d2c4333e5f14 getremotechanges: fix incoming support Augie Fackler <durin42@gmail.com> parents: 412 diff changeset	247 revs = args[0]
d2c4333e5f14 getremotechanges: fix incoming support Augie Fackler <durin42@gmail.com> parents: 412 diff changeset	248 else:
d2c4333e5f14 getremotechanges: fix incoming support Augie Fackler <durin42@gmail.com> parents: 412 diff changeset	249 revs = opts.get('onlyheads', opts.get('revs'))
667 b5ef3f0e0efe getremotechanges: use githandler from repo Siddharth Agarwal <sid0@fb.com> parents: 666 diff changeset	250 r, c, cleanup = repo.githandler.getremotechanges(other, revs)
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 389 diff changeset	251 # ugh. This is ugly even by mercurial API compatibility standards
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 389 diff changeset	252 if 'onlyheads' not in orig.func_code.co_varnames:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 389 diff changeset	253 cleanup = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 389 diff changeset	254 return r, c, cleanup
412 5932586e6d43 Fix mercurial issue2855 Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	255 return orig(ui, repo, other, args, *opts)
677 73cf8d292dcb getremotechanges: drop support for Mercurial < 1.7 Siddharth Agarwal <sid0@fb.com> parents: 676 diff changeset	256 extensions.wrapfunction(bundlerepo, 'getremotechanges', getremotechanges)
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 389 diff changeset	257
556 affd119533ae peer: pass localrepo to new gitrepo instances David M. Carr <david@carrclan.us> parents: 546 diff changeset	258 def peer(orig, uiorrepo, args, *opts):
affd119533ae peer: pass localrepo to new gitrepo instances David M. Carr <david@carrclan.us> parents: 546 diff changeset	259 newpeer = orig(uiorrepo, args, *opts)
affd119533ae peer: pass localrepo to new gitrepo instances David M. Carr <david@carrclan.us> parents: 546 diff changeset	260 if isinstance(newpeer, gitrepo.gitrepo):
affd119533ae peer: pass localrepo to new gitrepo instances David M. Carr <david@carrclan.us> parents: 546 diff changeset	261 if isinstance(uiorrepo, localrepo.localrepository):
affd119533ae peer: pass localrepo to new gitrepo instances David M. Carr <david@carrclan.us> parents: 546 diff changeset	262 newpeer.localrepo = uiorrepo
affd119533ae peer: pass localrepo to new gitrepo instances David M. Carr <david@carrclan.us> parents: 546 diff changeset	263 return newpeer
affd119533ae peer: pass localrepo to new gitrepo instances David M. Carr <david@carrclan.us> parents: 546 diff changeset	264 extensions.wrapfunction(hg, 'peer', peer)
affd119533ae peer: pass localrepo to new gitrepo instances David M. Carr <david@carrclan.us> parents: 546 diff changeset	265
780 db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	266 @util.transform_notgit
913 b1b03873c9ad hggit: adapt pull wrapper function for recent hg Augie Fackler <augie@google.com> parents: 912 diff changeset	267 def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=(),
b1b03873c9ad hggit: adapt pull wrapper function for recent hg Augie Fackler <augie@google.com> parents: 912 diff changeset	268 **kwargs):
780 db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	269 if isinstance(remote, gitrepo.gitrepo):
841 ef904bd8d3fb exchangepull: fixup for introduction of transaction manager upstream Siddharth Agarwal <sid0@fb.com> parents: 782 diff changeset	270 # transaction manager is present in Mercurial >= 3.3
847 05eb0874fa30 init: add a try/except to retain compatibility with Mercurial 3.2 Siddharth Agarwal <sid0@fb.com> parents: 841 diff changeset	271 try:
05eb0874fa30 init: add a try/except to retain compatibility with Mercurial 3.2 Siddharth Agarwal <sid0@fb.com> parents: 841 diff changeset	272 trmanager = getattr(exchange, 'transactionmanager')
05eb0874fa30 init: add a try/except to retain compatibility with Mercurial 3.2 Siddharth Agarwal <sid0@fb.com> parents: 841 diff changeset	273 except AttributeError:
05eb0874fa30 init: add a try/except to retain compatibility with Mercurial 3.2 Siddharth Agarwal <sid0@fb.com> parents: 841 diff changeset	274 trmanager = None
780 db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	275 pullop = exchange.pulloperation(repo, remote, heads, force,
db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	276 bookmarks=bookmarks)
841 ef904bd8d3fb exchangepull: fixup for introduction of transaction manager upstream Siddharth Agarwal <sid0@fb.com> parents: 782 diff changeset	277 if trmanager:
ef904bd8d3fb exchangepull: fixup for introduction of transaction manager upstream Siddharth Agarwal <sid0@fb.com> parents: 782 diff changeset	278 pullop.trmanager = trmanager(repo, 'pull', remote.url())
897 8026c094173a pull: acquire wlock before lock to fix lock-checker warnings Augie Fackler <raf@durin42.com> parents: 887 diff changeset	279 wlock = repo.wlock()
780 db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	280 lock = repo.lock()
db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	281 try:
db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	282 pullop.cgresult = repo.githandler.fetch(remote.path, heads)
841 ef904bd8d3fb exchangepull: fixup for introduction of transaction manager upstream Siddharth Agarwal <sid0@fb.com> parents: 782 diff changeset	283 if trmanager:
ef904bd8d3fb exchangepull: fixup for introduction of transaction manager upstream Siddharth Agarwal <sid0@fb.com> parents: 782 diff changeset	284 pullop.trmanager.close()
ef904bd8d3fb exchangepull: fixup for introduction of transaction manager upstream Siddharth Agarwal <sid0@fb.com> parents: 782 diff changeset	285 else:
ef904bd8d3fb exchangepull: fixup for introduction of transaction manager upstream Siddharth Agarwal <sid0@fb.com> parents: 782 diff changeset	286 pullop.closetransaction()
780 db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	287 return pullop
db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	288 finally:
841 ef904bd8d3fb exchangepull: fixup for introduction of transaction manager upstream Siddharth Agarwal <sid0@fb.com> parents: 782 diff changeset	289 if trmanager:
ef904bd8d3fb exchangepull: fixup for introduction of transaction manager upstream Siddharth Agarwal <sid0@fb.com> parents: 782 diff changeset	290 pullop.trmanager.release()
ef904bd8d3fb exchangepull: fixup for introduction of transaction manager upstream Siddharth Agarwal <sid0@fb.com> parents: 782 diff changeset	291 else:
ef904bd8d3fb exchangepull: fixup for introduction of transaction manager upstream Siddharth Agarwal <sid0@fb.com> parents: 782 diff changeset	292 pullop.releasetransaction()
780 db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	293 lock.release()
897 8026c094173a pull: acquire wlock before lock to fix lock-checker warnings Augie Fackler <raf@durin42.com> parents: 887 diff changeset	294 wlock.release()
780 db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	295 else:
913 b1b03873c9ad hggit: adapt pull wrapper function for recent hg Augie Fackler <augie@google.com> parents: 912 diff changeset	296 return orig(repo, remote, heads, force, bookmarks=bookmarks, **kwargs)
780 db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	297 if not hgutil.safehasattr(localrepo.localrepository, 'pull'):
db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	298 # Mercurial >= 3.2
db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	299 extensions.wrapfunction(exchange, 'pull', exchangepull)
db10082cf043 exchange: wrap pull if localrepository.pull isn't available Siddharth Agarwal <sid0@fb.com> parents: 768 diff changeset	300
781 8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	301 # TODO figure out something useful to do with the newbranch param
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	302 @util.transform_notgit
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	303 def exchangepush(orig, repo, remote, force=False, revs=None, newbranch=False,
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	304 bookmarks=()):
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	305 if isinstance(remote, gitrepo.gitrepo):
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	306 pushop = exchange.pushoperation(repo, remote, force, revs, newbranch,
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	307 bookmarks)
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	308 pushop.cgresult = repo.githandler.push(remote.path, revs, force)
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	309 return pushop
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	310 else:
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	311 return orig(repo, remote, force, revs, newbranch, bookmarks=bookmarks)
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	312 if not hgutil.safehasattr(localrepo.localrepository, 'push'):
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	313 # Mercurial >= 3.2
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	314 extensions.wrapfunction(exchange, 'push', exchangepush)
8bfb1d72b49c exchange: wrap push if localrepository.push isn't available Siddharth Agarwal <sid0@fb.com> parents: 780 diff changeset	315
483 d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	316 def revset_fromgit(repo, subset, x):
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	317 '''``fromgit()``
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	318 Select changesets that originate from Git.
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	319 '''
887 8f9d52f7942e init: whitespace and formating cleanup Sean Farley <sean@farley.io> parents: 857 diff changeset	320 revset.getargs(x, 0, 0, "fromgit takes no arguments")
668 98e118410521 revset_fromgit: use githandler from repo Siddharth Agarwal <sid0@fb.com> parents: 667 diff changeset	321 git = repo.githandler
714 5770a5a8bc00 revset_fromgit: use repo.changelog.node instead of contexts Siddharth Agarwal <sid0@fb.com> parents: 713 diff changeset	322 node = repo.changelog.node
5770a5a8bc00 revset_fromgit: use repo.changelog.node instead of contexts Siddharth Agarwal <sid0@fb.com> parents: 713 diff changeset	323 return [r for r in subset if git.map_git_get(hex(node(r))) is not None]
483 d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	324
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	325 def revset_gitnode(repo, subset, x):
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	326 '''``gitnode(hash)``
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	327 Select changesets that originate in the given Git revision.
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	328 '''
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	329 args = revset.getargs(x, 1, 1, "gitnode takes one argument")
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	330 rev = revset.getstring(args[0],
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	331 "the argument to gitnode() must be a hash")
669 b8fff2f4e963 revset_gitnode: use githandler from repo Siddharth Agarwal <sid0@fb.com> parents: 668 diff changeset	332 git = repo.githandler
713 96f0463a4e54 revset_gitnode: use repo.changelog.node instead of contexts Siddharth Agarwal <sid0@fb.com> parents: 706 diff changeset	333 node = repo.changelog.node
887 8f9d52f7942e init: whitespace and formating cleanup Sean Farley <sean@farley.io> parents: 857 diff changeset	334
483 d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	335 def matches(r):
713 96f0463a4e54 revset_gitnode: use repo.changelog.node instead of contexts Siddharth Agarwal <sid0@fb.com> parents: 706 diff changeset	336 gitnode = git.map_git_get(hex(node(r)))
483 d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	337 if gitnode is None:
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	338 return False
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	339 return rev in [gitnode, gitnode[:12]]
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	340 return [r for r in subset if matches(r)]
d2caea269670 revsets: add fromgit and gitnode selectors David M. Carr <david@carrclan.us> parents: 482 diff changeset	341
482 00d591868a2f templatekw: add support for gitnode template keyword David M. Carr <david@carrclan.us> parents: 481 diff changeset	342 def gitnodekw(**args):
00d591868a2f templatekw: add support for gitnode template keyword David M. Carr <david@carrclan.us> parents: 481 diff changeset	343 """:gitnode: String. The Git changeset identification hash, as a 40 hexadecimal digit string."""
00d591868a2f templatekw: add support for gitnode template keyword David M. Carr <david@carrclan.us> parents: 481 diff changeset	344 node = args['ctx']
00d591868a2f templatekw: add support for gitnode template keyword David M. Carr <david@carrclan.us> parents: 481 diff changeset	345 repo = args['repo']
670 ab3c64db47d8 gitnodekw: use githandler from repo Siddharth Agarwal <sid0@fb.com> parents: 669 diff changeset	346 gitnode = repo.githandler.map_git_get(node.hex())
482 00d591868a2f templatekw: add support for gitnode template keyword David M. Carr <david@carrclan.us> parents: 481 diff changeset	347 if gitnode is None:
00d591868a2f templatekw: add support for gitnode template keyword David M. Carr <david@carrclan.us> parents: 481 diff changeset	348 gitnode = ''
00d591868a2f templatekw: add support for gitnode template keyword David M. Carr <david@carrclan.us> parents: 481 diff changeset	349 return gitnode

Mercurial > hg-git

annotate hggit/__init__.py @ 924:7c80e9f8131f

annotate hggit/init.py @ 924:7c80e9f8131f