hg-git: hggit/git_handler.py annotate

annotate hggit/git_handler.py @ 541:df1598b722e8

Precompile Git progress regular expressions

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Fri, 21 Sep 2012 19:42:24 -0700
parents	3fb942852b1c
children	c9faba7d01f4

rev	line source
267 7814c26758a2 remove unused imports Antonin Amand <antonin.amand@gmail.com> parents: 266 diff changeset	1 import os, math, urllib, re
476 b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	2 import stat, posixpath, StringIO
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	3
523 8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 490 diff changeset	4 from dulwich.errors import HangupException, GitProtocolError, UpdateRefsError
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	5 from dulwich.index import commit_tree
476 b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	6 from dulwich.objects import Blob, Commit, Tag, Tree, parse_timezone, S_IFGITLINK
225 cde57730faa7 store non utf-8 encoded author/commit message as deltas Abderrahim Kitouni <a.kitouni@gmail.com> parents: 224 diff changeset	7 from dulwich.pack import create_delta, apply_delta
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	8 from dulwich.repo import Repo
285 5e5aee9b32d4 git_handler: slight style cleanup Augie Fackler <durin42@gmail.com> parents: 284 diff changeset	9 from dulwich import client
476 b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	10 from dulwich import config as dul_config
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	11
375 454fc525ac75 support upcoming Mercurial 1.8 Kevin Bullock <kbullock@ringworld.org> parents: 374 diff changeset	12 try:
454fc525ac75 support upcoming Mercurial 1.8 Kevin Bullock <kbullock@ringworld.org> parents: 374 diff changeset	13 from mercurial import bookmarks
454fc525ac75 support upcoming Mercurial 1.8 Kevin Bullock <kbullock@ringworld.org> parents: 374 diff changeset	14 bookmarks.update
379 ed8034b1cb0d Made hggit.git_handler.get_changed_refs try to use commands.bookmark before trying with bookmarks.bookmark, for compatibility with Mercurial 1.8+. DontCare4Free <webmaster@dontcare4free.tk> parents: 376 diff changeset	15 from mercurial import commands
375 454fc525ac75 support upcoming Mercurial 1.8 Kevin Bullock <kbullock@ringworld.org> parents: 374 diff changeset	16 except ImportError:
454fc525ac75 support upcoming Mercurial 1.8 Kevin Bullock <kbullock@ringworld.org> parents: 374 diff changeset	17 from hgext import bookmarks
439 3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	18 try:
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	19 from mercurial.error import RepoError
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	20 except ImportError:
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	21 from mercurial.repo import RepoError
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	22
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	23 from mercurial.i18n import _
188 5d48a2310e16 Use mercurial.node.bin instead of dulwich.objects.hex_to_sha Abderrahim Kitouni <a.kitouni@gmail.com> parents: 187 diff changeset	24 from mercurial.node import hex, bin, nullid
222 e414c72d3ec9 fix compatibility with mercurial 1.1 Abderrahim Kitouni <a.kitouni@gmail.com> parents: 221 diff changeset	25 from mercurial import context, util as hgutil
300 eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	26 from mercurial import error
222 e414c72d3ec9 fix compatibility with mercurial 1.1 Abderrahim Kitouni <a.kitouni@gmail.com> parents: 221 diff changeset	27
369 e5c743cd0da1 pass hg's ui.ssh config to dulwich Tay Ray Chuan <rctay89@gmail.com> parents: 368 diff changeset	28 import _ssh
320 6eded2e4c616 Un-break hg 1.3 by adding a compat layer for progress. Augie Fackler <durin42@gmail.com> parents: 317 diff changeset	29 import util
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	30 from overlay import overlayrepo
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	31
537 6e05aa1b536d Optimize get_git_author Gregory Szorc <gregory.szorc@gmail.com> parents: 523 diff changeset	32 RE_GIT_AUTHOR = re.compile('^(.?) ?\<(.?)(?:\>(.*))?$')
6e05aa1b536d Optimize get_git_author Gregory Szorc <gregory.szorc@gmail.com> parents: 523 diff changeset	33
539 7bf60690386c Precompile Git username sanitizing regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 538 diff changeset	34 RE_GIT_SANITIZE_AUTHOR = re.compile('[<>\n]')
7bf60690386c Precompile Git username sanitizing regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 538 diff changeset	35
540 3fb942852b1c Precompile Git author extra data regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 539 diff changeset	36 RE_GIT_AUTHOR_EXTRA = re.compile('^(.?)\ ext:$(.)$ <(.*)\>$')
3fb942852b1c Precompile Git author extra data regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 539 diff changeset	37
538 a38abdbab77c Precompile Git URI regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 537 diff changeset	38 # Test for git:// and git+ssh:// URI.
a38abdbab77c Precompile Git URI regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 537 diff changeset	39 # Support several URL forms, including separating the
a38abdbab77c Precompile Git URI regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 537 diff changeset	40 # host and path with either a / or : (sepr)
a38abdbab77c Precompile Git URI regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 537 diff changeset	41 RE_GIT_URI = re.compile(
a38abdbab77c Precompile Git URI regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 537 diff changeset	42 r'^(?P<scheme>git([+]ssh)?://)(?P<host>.*?)(:(?P<port>\d+))?'
a38abdbab77c Precompile Git URI regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 537 diff changeset	43 r'(?P<sepr>[:/])(?P<path>.*)$')
a38abdbab77c Precompile Git URI regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 537 diff changeset	44
541 df1598b722e8 Precompile Git progress regular expressions Gregory Szorc <gregory.szorc@gmail.com> parents: 540 diff changeset	45 RE_NEWLINES = re.compile('[\r\n]')
df1598b722e8 Precompile Git progress regular expressions Gregory Szorc <gregory.szorc@gmail.com> parents: 540 diff changeset	46 RE_GIT_PROGRESS = re.compile('$(\d+)/(\d+)$')
df1598b722e8 Precompile Git progress regular expressions Gregory Szorc <gregory.szorc@gmail.com> parents: 540 diff changeset	47
411 de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	48 class GitProgress(object):
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	49 """convert git server progress strings into mercurial progress"""
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	50 def __init__(self, ui):
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	51 self.ui = ui
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	52
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	53 self.lasttopic = None
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	54 self.msgbuf = ''
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	55
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	56 def progress(self, msg):
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	57 # 'Counting objects: 33640, done.\n'
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	58 # 'Compressing objects: 0% (1/9955) \r
541 df1598b722e8 Precompile Git progress regular expressions Gregory Szorc <gregory.szorc@gmail.com> parents: 540 diff changeset	59 msgs = RE_NEWLINES.split(self.msgbuf + msg)
411 de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	60 self.msgbuf = msgs.pop()
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	61
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	62 for msg in msgs:
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	63 td = msg.split(':', 1)
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	64 data = td.pop()
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	65 if not td:
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	66 self.flush(data)
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	67 continue
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	68 topic = td[0]
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	69
541 df1598b722e8 Precompile Git progress regular expressions Gregory Szorc <gregory.szorc@gmail.com> parents: 540 diff changeset	70 m = RE_GIT_PROGRESS.search(data)
411 de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	71 if m:
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	72 if self.lasttopic and self.lasttopic != topic:
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	73 self.flush()
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	74 self.lasttopic = topic
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	75
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	76 pos, total = map(int, m.group(1, 2))
413 b8eeabb61c7b test fixes for progress cleanup Augie Fackler <durin42@gmail.com> parents: 411 diff changeset	77 util.progress(self.ui, topic, pos, total=total)
411 de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	78 else:
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	79 self.flush(msg)
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	80
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	81 def flush(self, msg=None):
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	82 if self.lasttopic:
413 b8eeabb61c7b test fixes for progress cleanup Augie Fackler <durin42@gmail.com> parents: 411 diff changeset	83 util.progress(self.ui, self.lasttopic, None)
411 de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	84 self.lasttopic = None
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	85 if msg:
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	86 self.ui.note(msg + '\n')
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	87
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	88 class GitHandler(object):
298 6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs Augie Fackler <durin42@gmail.com> parents: 293 diff changeset	89 mapfile = 'git-mapfile'
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs Augie Fackler <durin42@gmail.com> parents: 293 diff changeset	90 tagsfile = 'git-tags'
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	91
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	92 def __init__(self, dest_repo, ui):
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	93 self.repo = dest_repo
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	94 self.ui = ui
133 f2dfb2bed724 Allow storing the git directory intree Sverre Rabbelier <sverre@rabbelier.nl> parents: 118 diff changeset	95
324 f0c1c35d95ba explicitly expect boolean values for git.intree Tay Ray Chuan <rctay89@gmail.com> parents: 320 diff changeset	96 if ui.configbool('git', 'intree'):
133 f2dfb2bed724 Allow storing the git directory intree Sverre Rabbelier <sverre@rabbelier.nl> parents: 118 diff changeset	97 self.gitdir = self.repo.wjoin('.git')
f2dfb2bed724 Allow storing the git directory intree Sverre Rabbelier <sverre@rabbelier.nl> parents: 118 diff changeset	98 else:
f2dfb2bed724 Allow storing the git directory intree Sverre Rabbelier <sverre@rabbelier.nl> parents: 118 diff changeset	99 self.gitdir = self.repo.join('git')
f2dfb2bed724 Allow storing the git directory intree Sverre Rabbelier <sverre@rabbelier.nl> parents: 118 diff changeset	100
450 163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	101 self.init_author_file()
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	102
184 7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	103 self.paths = ui.configitems('paths')
141 a989866eead8 Make it possible to limit what branches are imported Sverre Rabbelier <sverre@rabbelier.nl> parents: 140 diff changeset	104
441 35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	105 self.branch_bookmark_suffix = ui.config('git', 'branch_bookmark_suffix')
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	106
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	107 self.load_map()
187 5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	108 self.load_tags()
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	109
2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	110 # make the git data directory
16 58cd05129119 moved init into git_handler Scott Chacon <schacon@gmail.com> parents: 14 diff changeset	111 def init_if_missing(self):
258 1590c97d7af0 do not init the cache git repo unless needed (fixes issue 16 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 248 diff changeset	112 if os.path.exists(self.gitdir):
1590c97d7af0 do not init the cache git repo unless needed (fixes issue 16 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 248 diff changeset	113 self.git = Repo(self.gitdir)
1590c97d7af0 do not init the cache git repo unless needed (fixes issue 16 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 248 diff changeset	114 else:
106 3aa2f6caed16 make the gitdir a constant Sverre Rabbelier <sverre@rabbelier.nl> parents: 105 diff changeset	115 os.mkdir(self.gitdir)
258 1590c97d7af0 do not init the cache git repo unless needed (fixes issue 16 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 248 diff changeset	116 self.git = Repo.init_bare(self.gitdir)
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	117
450 163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	118 def init_author_file(self):
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	119 self.author_map = {}
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	120 if self.ui.config('git', 'authors'):
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	121 with open(self.repo.wjoin(
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	122 self.ui.config('git', 'authors')
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	123 )) as f:
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	124 for line in f:
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	125 line = line.strip()
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	126 if not line or line.startswith('#'):
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	127 continue
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	128 from_, to = re.split(r'\s=\s', line, 2)
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	129 self.author_map[from_] = to
163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	130
14 36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	131 ## FILE LOAD AND SAVE METHODS
36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	132
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	133 def map_set(self, gitsha, hgsha):
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	134 self._map_git[gitsha] = hgsha
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	135 self._map_hg[hgsha] = gitsha
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	136
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	137 def map_hg_get(self, gitsha):
213 61471faeb7fd small cleanups (tabs, s/TODO :/TODO:/ and dead code) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 212 diff changeset	138 return self._map_git.get(gitsha)
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	139
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	140 def map_git_get(self, hgsha):
213 61471faeb7fd small cleanups (tabs, s/TODO :/TODO:/ and dead code) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 212 diff changeset	141 return self._map_hg.get(hgsha)
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	142
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	143 def load_map(self):
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	144 self._map_git = {}
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	145 self._map_hg = {}
105 41e76444105c make git-mapfile and git-configfile constants Sverre Rabbelier <sverre@rabbelier.nl> parents: 104 diff changeset	146 if os.path.exists(self.repo.join(self.mapfile)):
41e76444105c make git-mapfile and git-configfile constants Sverre Rabbelier <sverre@rabbelier.nl> parents: 104 diff changeset	147 for line in self.repo.opener(self.mapfile):
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	148 gitsha, hgsha = line.strip().split(' ', 1)
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	149 self._map_git[gitsha] = hgsha
13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	150 self._map_hg[hgsha] = gitsha
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	151
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	152 def save_map(self):
105 41e76444105c make git-mapfile and git-configfile constants Sverre Rabbelier <sverre@rabbelier.nl> parents: 104 diff changeset	153 file = self.repo.opener(self.mapfile, 'w+', atomictemp=True)
238 028de6256c2b switch object mapping to hg->git since the many to one is that direction Sverre Rabbelier <srabbelier@google.com> parents: 237 diff changeset	154 for hgsha, gitsha in sorted(self._map_hg.iteritems()):
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	155 file.write("%s %s\n" % (gitsha, hgsha))
429 6674c0d42d68 Adapt to atomictempfile API changes from Mercurial. Augie Fackler <durin42@gmail.com> parents: 422 diff changeset	156 # If this complains that NoneType is not callable, then
6674c0d42d68 Adapt to atomictempfile API changes from Mercurial. Augie Fackler <durin42@gmail.com> parents: 422 diff changeset	157 # atomictempfile no longer has either of rename (pre-1.9) or
6674c0d42d68 Adapt to atomictempfile API changes from Mercurial. Augie Fackler <durin42@gmail.com> parents: 422 diff changeset	158 # close (post-1.9)
6674c0d42d68 Adapt to atomictempfile API changes from Mercurial. Augie Fackler <durin42@gmail.com> parents: 422 diff changeset	159 getattr(file, 'rename', getattr(file, 'close', None))()
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	160
187 5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	161 def load_tags(self):
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	162 self.tags = {}
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	163 if os.path.exists(self.repo.join(self.tagsfile)):
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	164 for line in self.repo.opener(self.tagsfile):
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	165 sha, name = line.strip().split(' ', 1)
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	166 self.tags[name] = sha
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	167
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	168 def save_tags(self):
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	169 file = self.repo.opener(self.tagsfile, 'w+', atomictemp=True)
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	170 for name, sha in sorted(self.tags.iteritems()):
212 174954c187e0 fix pushing tags to git (see issue 3 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 210 diff changeset	171 if not self.repo.tagtype(name) == 'global':
174954c187e0 fix pushing tags to git (see issue 3 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 210 diff changeset	172 file.write("%s %s\n" % (sha, name))
429 6674c0d42d68 Adapt to atomictempfile API changes from Mercurial. Augie Fackler <durin42@gmail.com> parents: 422 diff changeset	173 # If this complains that NoneType is not callable, then
6674c0d42d68 Adapt to atomictempfile API changes from Mercurial. Augie Fackler <durin42@gmail.com> parents: 422 diff changeset	174 # atomictempfile no longer has either of rename (pre-1.9) or
6674c0d42d68 Adapt to atomictempfile API changes from Mercurial. Augie Fackler <durin42@gmail.com> parents: 422 diff changeset	175 # close (post-1.9)
6674c0d42d68 Adapt to atomictempfile API changes from Mercurial. Augie Fackler <durin42@gmail.com> parents: 422 diff changeset	176 getattr(file, 'rename', getattr(file, 'close', None))()
187 5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	177
14 36e94e805fa7 added basic config file for remembering remote urls Scott Chacon <schacon@gmail.com> parents: 13 diff changeset	178 ## END FILE LOAD AND SAVE METHODS
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	179
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	180 ## COMMANDS METHODS
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	181
137 5aefcbf1e50c add a gimport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 136 diff changeset	182 def import_commits(self, remote_name):
5aefcbf1e50c add a gimport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 136 diff changeset	183 self.import_git_objects(remote_name)
422 09cedf16ecc0 Fix all-version-tests. Augie Fackler <durin42@gmail.com> parents: 419 diff changeset	184 self.update_hg_bookmarks(self.git.get_refs())
137 5aefcbf1e50c add a gimport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 136 diff changeset	185 self.save_map()
5aefcbf1e50c add a gimport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 136 diff changeset	186
232 0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	187 def fetch(self, remote, heads):
236 42ae65e6c1d1 save the map only once in export Abderrahim Kitouni <a.kitouni@gmail.com> parents: 235 diff changeset	188 self.export_commits()
232 0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	189 refs = self.fetch_pack(remote, heads)
184 7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	190 remote_name = self.remote_name(remote)
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	191
397 60d181f9ecc3 Make pull results more like hg pulls. Brendan Cully <brendan@kublai.com> parents: 395 diff changeset	192 oldrefs = self.git.get_refs()
56 5185af4e649a hg gfetch now works Scott Chacon <schacon@gmail.com> parents: 54 diff changeset	193 if refs:
149 eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	194 self.import_git_objects(remote_name, refs)
187 5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	195 self.import_tags(refs)
184 7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	196 self.update_hg_bookmarks(refs)
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	197 if remote_name:
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	198 self.update_remote_branches(remote_name, refs)
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	199 elif not self.paths:
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	200 # intial cloning
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	201 self.update_remote_branches('default', refs)
387 ed28dd69df61 git_handler: support versions of hg without bookmarks Augie Fackler <durin42@gmail.com> parents: 385 diff changeset	202
384 fc37cb795b51 activate a tipmost bookmark (git branch) after clone Adrian Sampson <adrian@radbox.org> parents: 382 diff changeset	203 # "Activate" a tipmost bookmark.
387 ed28dd69df61 git_handler: support versions of hg without bookmarks Augie Fackler <durin42@gmail.com> parents: 385 diff changeset	204 bms = getattr(self.repo['tip'], 'bookmarks',
ed28dd69df61 git_handler: support versions of hg without bookmarks Augie Fackler <durin42@gmail.com> parents: 385 diff changeset	205 lambda : None)()
384 fc37cb795b51 activate a tipmost bookmark (git branch) after clone Adrian Sampson <adrian@radbox.org> parents: 382 diff changeset	206 if bms:
fc37cb795b51 activate a tipmost bookmark (git branch) after clone Adrian Sampson <adrian@radbox.org> parents: 382 diff changeset	207 bookmarks.setcurrent(self.repo, bms[0])
397 60d181f9ecc3 Make pull results more like hg pulls. Brendan Cully <brendan@kublai.com> parents: 395 diff changeset	208
60d181f9ecc3 Make pull results more like hg pulls. Brendan Cully <brendan@kublai.com> parents: 395 diff changeset	209 def remoteref(ref):
60d181f9ecc3 Make pull results more like hg pulls. Brendan Cully <brendan@kublai.com> parents: 395 diff changeset	210 rn = remote_name or 'default'
60d181f9ecc3 Make pull results more like hg pulls. Brendan Cully <brendan@kublai.com> parents: 395 diff changeset	211 return 'refs/remotes/' + rn + ref[10:]
60d181f9ecc3 Make pull results more like hg pulls. Brendan Cully <brendan@kublai.com> parents: 395 diff changeset	212
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	213 modheads = [refs[k] for k in refs if k.startswith('refs/heads/')
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	214 and not k.endswith('^{}')
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	215 and refs[k] != oldrefs.get(remoteref(k))]
397 60d181f9ecc3 Make pull results more like hg pulls. Brendan Cully <brendan@kublai.com> parents: 395 diff changeset	216
60d181f9ecc3 Make pull results more like hg pulls. Brendan Cully <brendan@kublai.com> parents: 395 diff changeset	217 if not modheads:
60d181f9ecc3 Make pull results more like hg pulls. Brendan Cully <brendan@kublai.com> parents: 395 diff changeset	218 self.ui.status(_("no changes found\n"))
184 7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	219
7 89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	220 self.save_map()
89992b6d2eef mapping parents properly now Scott Chacon <schacon@gmail.com> parents: 6 diff changeset	221
397 60d181f9ecc3 Make pull results more like hg pulls. Brendan Cully <brendan@kublai.com> parents: 395 diff changeset	222 return len(modheads)
60d181f9ecc3 Make pull results more like hg pulls. Brendan Cully <brendan@kublai.com> parents: 395 diff changeset	223
236 42ae65e6c1d1 save the map only once in export Abderrahim Kitouni <a.kitouni@gmail.com> parents: 235 diff changeset	224 def export_commits(self):
42ae65e6c1d1 save the map only once in export Abderrahim Kitouni <a.kitouni@gmail.com> parents: 235 diff changeset	225 try:
172 ac92cdc45ceb not trying to write the same tree twice Scott Chacon <schacon@gmail.com> parents: 171 diff changeset	226 self.export_git_objects()
236 42ae65e6c1d1 save the map only once in export Abderrahim Kitouni <a.kitouni@gmail.com> parents: 235 diff changeset	227 self.export_hg_tags()
42ae65e6c1d1 save the map only once in export Abderrahim Kitouni <a.kitouni@gmail.com> parents: 235 diff changeset	228 self.update_references()
42ae65e6c1d1 save the map only once in export Abderrahim Kitouni <a.kitouni@gmail.com> parents: 235 diff changeset	229 finally:
42ae65e6c1d1 save the map only once in export Abderrahim Kitouni <a.kitouni@gmail.com> parents: 235 diff changeset	230 self.save_map()
97 f0628f5270b6 add gexport command Sverre Rabbelier <sverre@rabbelier.nl> parents: 96 diff changeset	231
231 bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	232 def get_refs(self, remote):
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	233 self.export_commits()
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	234 client, path = self.get_transport_and_path(remote)
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	235 old_refs = {}
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	236 new_refs = {}
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	237 def changed(refs):
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	238 old_refs.update(refs)
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	239 to_push = set(self.local_heads().values() + self.tags.values())
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	240 new_refs.update(self.get_changed_refs(refs, to_push, True))
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	241 # don't push anything
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	242 return {}
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	243
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	244 try:
523 8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 490 diff changeset	245 try:
8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 490 diff changeset	246 client.send_pack(path, changed, lambda have, want: [])
8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 490 diff changeset	247 except UpdateRefsError:
8c1f2b07c04b outgoing: re-introduce support for outgoing David M. Carr <david@carrclan.us> parents: 490 diff changeset	248 pass # dulwich throws an error when send_pack doesn't upload
243 53b731d2a3e2 outgoing: don't crash when there are unpulled changesets Abderrahim Kitouni <a.kitouni@gmail.com> parents: 242 diff changeset	249
53b731d2a3e2 outgoing: don't crash when there are unpulled changesets Abderrahim Kitouni <a.kitouni@gmail.com> parents: 242 diff changeset	250 changed_refs = [ref for ref, sha in new_refs.iteritems()
53b731d2a3e2 outgoing: don't crash when there are unpulled changesets Abderrahim Kitouni <a.kitouni@gmail.com> parents: 242 diff changeset	251 if sha != old_refs.get(ref)]
53b731d2a3e2 outgoing: don't crash when there are unpulled changesets Abderrahim Kitouni <a.kitouni@gmail.com> parents: 242 diff changeset	252 new = [bin(self.map_hg_get(new_refs[ref])) for ref in changed_refs]
418 10027b50202b In some situations where a reference is being used but does not exist in _map_git or _map_hg, silently skip the reference rather than throwing an error. This allows hg outgoing to work on repositories which do not contain any revisions at all. mcc <andrew.mcclure@gmail.com> parents: 415 diff changeset	253 old = {}
10027b50202b In some situations where a reference is being used but does not exist in _map_git or _map_hg, silently skip the reference rather than throwing an error. This allows hg outgoing to work on repositories which do not contain any revisions at all. mcc <andrew.mcclure@gmail.com> parents: 415 diff changeset	254 for r in old_refs:
10027b50202b In some situations where a reference is being used but does not exist in _map_git or _map_hg, silently skip the reference rather than throwing an error. This allows hg outgoing to work on repositories which do not contain any revisions at all. mcc <andrew.mcclure@gmail.com> parents: 415 diff changeset	255 old_ref = self.map_hg_get(old_refs[r])
10027b50202b In some situations where a reference is being used but does not exist in _map_git or _map_hg, silently skip the reference rather than throwing an error. This allows hg outgoing to work on repositories which do not contain any revisions at all. mcc <andrew.mcclure@gmail.com> parents: 415 diff changeset	256 if old_ref:
10027b50202b In some situations where a reference is being used but does not exist in _map_git or _map_hg, silently skip the reference rather than throwing an error. This allows hg outgoing to work on repositories which do not contain any revisions at all. mcc <andrew.mcclure@gmail.com> parents: 415 diff changeset	257 old[bin(old_ref)] = 1
231 bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	258
bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	259 return old, new
391 9b6597b70839 Improve error reporting in get_refs Brendan Cully <brendan@kublai.com> parents: 387 diff changeset	260 except (HangupException, GitProtocolError), e:
9b6597b70839 Improve error reporting in get_refs Brendan Cully <brendan@kublai.com> parents: 387 diff changeset	261 raise hgutil.Abort(_("git remote error: ") + str(e))
231 bdaec2a079ce initial support for 'hg outgoing' Abderrahim Kitouni <a.kitouni@gmail.com> parents: 230 diff changeset	262
230 51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	263 def push(self, remote, revs, force):
221 4be68870dc44 do not pull from git when asked to push Abderrahim Kitouni <a.kitouni@gmail.com> parents: 219 diff changeset	264 self.export_commits()
487 68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	265 old_refs, new_refs = self.upload_pack(remote, revs, force)
196 40edc4b814e4 Reorganize push for more symmetry with fetch Abderrahim Kitouni <a.kitouni@gmail.com> parents: 195 diff changeset	266 remote_name = self.remote_name(remote)
40edc4b814e4 Reorganize push for more symmetry with fetch Abderrahim Kitouni <a.kitouni@gmail.com> parents: 195 diff changeset	267
487 68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	268 if remote_name and new_refs:
488 4793c3725abe push: only output updated refs David M. Carr <david@carrclan.us> parents: 487 diff changeset	269 for ref, new_sha in new_refs.iteritems():
4793c3725abe push: only output updated refs David M. Carr <david@carrclan.us> parents: 487 diff changeset	270 if new_sha != old_refs.get(ref):
487 68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	271 self.ui.status(" %s::%s => GIT:%s\n" %
488 4793c3725abe push: only output updated refs David M. Carr <david@carrclan.us> parents: 487 diff changeset	272 (remote_name, ref, new_sha[0:8]))
196 40edc4b814e4 Reorganize push for more symmetry with fetch Abderrahim Kitouni <a.kitouni@gmail.com> parents: 195 diff changeset	273
487 68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	274 self.update_remote_branches(remote_name, new_refs)
68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	275 if old_refs == new_refs:
489 ccd521a1f585 push: state when no changes are found David M. Carr <david@carrclan.us> parents: 488 diff changeset	276 self.ui.status(_("no changes found\n"))
487 68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	277 ret = None
68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	278 elif len(new_refs) > len(old_refs):
68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	279 ret = 1 + (len(new_refs) - len(old_refs))
68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	280 elif len(old_refs) > len(new_refs):
68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	281 ret = -1 - (len(new_refs) - len(old_refs))
68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	282 else:
68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	283 ret = 1
68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	284 return ret
196 40edc4b814e4 Reorganize push for more symmetry with fetch Abderrahim Kitouni <a.kitouni@gmail.com> parents: 195 diff changeset	285
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	286 def clear(self):
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	287 mapfile = self.repo.join(self.mapfile)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	288 if os.path.exists(self.gitdir):
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	289 for root, dirs, files in os.walk(self.gitdir, topdown=False):
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	290 for name in files:
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	291 os.remove(os.path.join(root, name))
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	292 for name in dirs:
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	293 os.rmdir(os.path.join(root, name))
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	294 os.rmdir(self.gitdir)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	295 if os.path.exists(mapfile):
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	296 os.remove(mapfile)
124 9dafb9ac24ff hg bookmarks to local git branches Ian Dees <undees@gmail.com> parents: 118 diff changeset	297
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	298 # incoming support
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	299 def getremotechanges(self, remote, revs):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	300 self.export_commits()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	301 refs = self.fetch_pack(remote.path, revs)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	302
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	303 # refs contains all remote refs. Prune to only those requested.
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	304 if revs:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	305 reqrefs = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	306 for rev in revs:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	307 for n in ('refs/heads/' + rev, 'refs/tags/' + rev):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	308 if n in refs:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	309 reqrefs[n] = refs[n]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	310 else:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	311 reqrefs = refs
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	312
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	313 commits = [bin(c) for c in self.getnewgitcommits(reqrefs)[1]]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	314
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	315 b = overlayrepo(self, commits, refs)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	316
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	317 return (b, commits, lambda: None)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	318
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	319 ## CHANGESET CONVERSION METHODS
125 5b702bbf078f local git branches to remotes Ian Dees <undees@gmail.com> parents: 124 diff changeset	320
21 13b9a020e382 gpush coming along. will now write blobs it doesn't have yet to git repo. Scott Chacon <schacon@gmail.com> parents: 19 diff changeset	321 def export_git_objects(self):
258 1590c97d7af0 do not init the cache git repo unless needed (fixes issue 16 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 248 diff changeset	322 self.init_if_missing()
1590c97d7af0 do not init the cache git repo unless needed (fixes issue 16 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 248 diff changeset	323
190 6fbdf1afe032 Better reporting of the number of commits to convert Abderrahim Kitouni <a.kitouni@gmail.com> parents: 188 diff changeset	324 nodes = [self.repo.lookup(n) for n in self.repo]
6fbdf1afe032 Better reporting of the number of commits to convert Abderrahim Kitouni <a.kitouni@gmail.com> parents: 188 diff changeset	325 export = [node for node in nodes if not hex(node) in self._map_hg]
6fbdf1afe032 Better reporting of the number of commits to convert Abderrahim Kitouni <a.kitouni@gmail.com> parents: 188 diff changeset	326 total = len(export)
392 8bb058d6a9ee Message cleanups Brendan Cully <brendan@kublai.com> parents: 391 diff changeset	327 if total:
8bb058d6a9ee Message cleanups Brendan Cully <brendan@kublai.com> parents: 391 diff changeset	328 self.ui.status(_("exporting hg objects to git\n"))
190 6fbdf1afe032 Better reporting of the number of commits to convert Abderrahim Kitouni <a.kitouni@gmail.com> parents: 188 diff changeset	329 for i, rev in enumerate(export):
392 8bb058d6a9ee Message cleanups Brendan Cully <brendan@kublai.com> parents: 391 diff changeset	330 util.progress(self.ui, 'exporting', i, total=total)
159 85eae64ca9e2 applied octopatch from dimichxp Scott Chacon <schacon@gmail.com> parents: 138 diff changeset	331 ctx = self.repo.changectx(rev)
85eae64ca9e2 applied octopatch from dimichxp Scott Chacon <schacon@gmail.com> parents: 138 diff changeset	332 state = ctx.extra().get('hg-git', None)
85eae64ca9e2 applied octopatch from dimichxp Scott Chacon <schacon@gmail.com> parents: 138 diff changeset	333 if state == 'octopus':
293 8aaae306d46f git_handler: 80 columns cleanup Augie Fackler <durin42@gmail.com> parents: 292 diff changeset	334 self.ui.debug("revision %d is a part "
8aaae306d46f git_handler: 80 columns cleanup Augie Fackler <durin42@gmail.com> parents: 292 diff changeset	335 "of octopus explosion\n" % ctx.rev())
159 85eae64ca9e2 applied octopatch from dimichxp Scott Chacon <schacon@gmail.com> parents: 138 diff changeset	336 continue
190 6fbdf1afe032 Better reporting of the number of commits to convert Abderrahim Kitouni <a.kitouni@gmail.com> parents: 188 diff changeset	337 self.export_hg_commit(rev)
374 f008197045d3 progress: use gerund form for import timeless <timeless@gmail.com> parents: 369 diff changeset	338 util.progress(self.ui, 'importing', None, total=total)
286 0661d5721ad7 git_handler: use progress API instead of reinventing the wheel Augie Fackler <durin42@gmail.com> parents: 285 diff changeset	339
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	340
24 41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	341 # convert this commit into git objects
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	342 # go through the manifest, convert all blobs/trees we don't have
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	343 # write the commit object (with metadata info)
41f4e0a85d15 fully converts hg changeset/manifest/files to git commits/trees/blobs Scott Chacon <schacon@gmail.com> parents: 23 diff changeset	344 def export_hg_commit(self, rev):
301 09116995c421 export_hg_commit: fix debug note Tay Ray Chuan <rctay89@gmail.com> parents: 288 diff changeset	345 self.ui.note(_("converting revision %s\n") % hex(rev))
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	346
203 104a4fd6a0af trying to fix some of the broken tests Abderrahim Kitouni <a.kitouni@gmail.com> parents: 199 diff changeset	347 oldenc = self.swap_out_encoding()
104a4fd6a0af trying to fix some of the broken tests Abderrahim Kitouni <a.kitouni@gmail.com> parents: 199 diff changeset	348
159 85eae64ca9e2 applied octopatch from dimichxp Scott Chacon <schacon@gmail.com> parents: 138 diff changeset	349 ctx = self.repo.changectx(rev)
85eae64ca9e2 applied octopatch from dimichxp Scott Chacon <schacon@gmail.com> parents: 138 diff changeset	350 extra = ctx.extra()
85eae64ca9e2 applied octopatch from dimichxp Scott Chacon <schacon@gmail.com> parents: 138 diff changeset	351
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	352 commit = Commit()
68 d28d3763eda3 Deal with hg authors missing email attributes. Chris Wanstrath <chris@ozmm.org> parents: 65 diff changeset	353
235 912d6a5837c8 reorganize export_hg_commit Abderrahim Kitouni <a.kitouni@gmail.com> parents: 234 diff changeset	354 (time, timezone) = ctx.date()
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	355 commit.author = self.get_git_author(ctx)
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	356 commit.author_time = int(time)
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	357 commit.author_timezone = -timezone
186 f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	358
89 e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	359 if 'committer' in extra:
131 dd6c77ec206c store commitdate in mercurial's internal format. Dmitriy Taychenachev <dimichxp@gmail.com> parents: 129 diff changeset	360 # fixup timezone
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	361 (name, timestamp, timezone) = extra['committer'].rsplit(' ', 2)
237 16f671995881 deal correctly with old timezone format in extra committer Abderrahim Kitouni <a.kitouni@gmail.com> parents: 236 diff changeset	362 commit.committer = name
16f671995881 deal correctly with old timezone format in extra committer Abderrahim Kitouni <a.kitouni@gmail.com> parents: 236 diff changeset	363 commit.commit_time = timestamp
16f671995881 deal correctly with old timezone format in extra committer Abderrahim Kitouni <a.kitouni@gmail.com> parents: 236 diff changeset	364
16f671995881 deal correctly with old timezone format in extra committer Abderrahim Kitouni <a.kitouni@gmail.com> parents: 236 diff changeset	365 # work around a timezone format change
16f671995881 deal correctly with old timezone format in extra committer Abderrahim Kitouni <a.kitouni@gmail.com> parents: 236 diff changeset	366 if int(timezone) % 60 != 0: #pragma: no cover
16f671995881 deal correctly with old timezone format in extra committer Abderrahim Kitouni <a.kitouni@gmail.com> parents: 236 diff changeset	367 timezone = parse_timezone(timezone)
360 c1fa188046d7 Looks like the latest version of Dulwich returns a tuple here. Let's handle that Mike Blume <mike@loggly.com> parents: 338 diff changeset	368 # Newer versions of Dulwich return a tuple here
c1fa188046d7 Looks like the latest version of Dulwich returns a tuple here. Let's handle that Mike Blume <mike@loggly.com> parents: 338 diff changeset	369 if isinstance(timezone, tuple):
c1fa188046d7 Looks like the latest version of Dulwich returns a tuple here. Let's handle that Mike Blume <mike@loggly.com> parents: 338 diff changeset	370 timezone, neg_utc = timezone
361 4e1ac77815c3 fix typo -- my bad >.< Mike Blume <mike@loggly.com> parents: 360 diff changeset	371 commit._commit_timezone_neg_utc = neg_utc
237 16f671995881 deal correctly with old timezone format in extra committer Abderrahim Kitouni <a.kitouni@gmail.com> parents: 236 diff changeset	372 else:
16f671995881 deal correctly with old timezone format in extra committer Abderrahim Kitouni <a.kitouni@gmail.com> parents: 236 diff changeset	373 timezone = -int(timezone)
16f671995881 deal correctly with old timezone format in extra committer Abderrahim Kitouni <a.kitouni@gmail.com> parents: 236 diff changeset	374 commit.commit_timezone = timezone
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	375 else:
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	376 commit.committer = commit.author
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	377 commit.commit_time = commit.author_time
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	378 commit.commit_timezone = commit.author_timezone
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	379
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	380 commit.parents = []
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	381 for parent in self.get_git_parents(ctx):
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	382 hgsha = hex(parent.node())
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	383 git_sha = self.map_git_get(hgsha)
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	384 if git_sha:
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	385 commit.parents.append(git_sha)
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	386
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	387 commit.message = self.get_git_message(ctx)
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	388
118 b3be536e3f50 handles git commit encoding fields now Scott Chacon <schacon@gmail.com> parents: 113 diff changeset	389 if 'encoding' in extra:
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	390 commit.encoding = extra['encoding']
89 e35ed99fa691 committer info now being kept properly Scott Chacon <schacon@gmail.com> parents: 88 diff changeset	391
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	392 tree_sha = commit_tree(self.git.object_store, self.iterblobs(ctx))
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	393 commit.tree = tree_sha
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	394
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	395 self.git.object_store.add_object(commit)
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	396 self.map_set(commit.id, ctx.hex())
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	397
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	398 self.swap_out_encoding(oldenc)
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	399 return commit.id
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	400
432 ccd38138a3b3 Improve the parsing of author lines from Mercurial to generate committer and author lines that git can correctly understand Ehsan Akhgari <ehsan.akhgari@gmail.com> parents: 429 diff changeset	401 def get_valid_git_username_email(self, name):
448 e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	402 r"""Sanitize usernames and emails to fit git's restrictions.
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	403
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	404 The following is taken from the man page of git's fast-import
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	405 command:
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	406
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	407 [...] Likewise LF means one (and only one) linefeed [...]
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	408
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	409 committer
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	410 The committer command indicates who made this commit,
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	411 and when they made it.
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	412
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	413 Here <name> is the person's display name (for example
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	414 "Com M Itter") and <email> is the person's email address
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	415 ("cm@example.com[1]"). LT and GT are the literal
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	416 less-than (\x3c) and greater-than (\x3e) symbols. These
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	417 are required to delimit the email address from the other
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	418 fields in the line. Note that <name> and <email> are
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	419 free-form and may contain any sequence of bytes, except
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	420 LT, GT and LF. <name> is typically UTF-8 encoded.
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	421
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	422 Accordingly, this function makes sure that there are none of the
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	423 characters <, >, or \n in any string which will be used for
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	424 a git username or email. Before this, it first removes left
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	425 angle brackets and spaces from the beginning, and right angle
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	426 brackets and spaces from the end, of this string, to convert
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	427 such things as " <john@doe.com> " to "john@doe.com" for
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	428 convenience.
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	429
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	430 TESTS:
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	431
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	432 >>> from mercurial.ui import ui
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	433 >>> g = GitHandler('', ui()).get_valid_git_username_email
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	434 >>> g('John Doe')
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	435 'John Doe'
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	436 >>> g('john@doe.com')
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	437 'john@doe.com'
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	438 >>> g(' <john@doe.com> ')
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	439 'john@doe.com'
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	440 >>> g(' <random<\n<garbage\n> > > ')
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	441 'random???garbage?'
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	442 >>> g('Typo in hgrc >but.hg-git@handles.it.gracefully>')
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	443 'Typo in hgrc ?but.hg-git@handles.it.gracefully'
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	444 """
539 7bf60690386c Precompile Git username sanitizing regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 538 diff changeset	445 return RE_GIT_SANITIZE_AUTHOR.sub('?', name.lstrip('< ').rstrip('> '))
432 ccd38138a3b3 Improve the parsing of author lines from Mercurial to generate committer and author lines that git can correctly understand Ehsan Akhgari <ehsan.akhgari@gmail.com> parents: 429 diff changeset	446
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	447 def get_git_author(self, ctx):
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	448 # hg authors might not have emails
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	449 author = ctx.user()
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	450
450 163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	451 # see if a translation exists
537 6e05aa1b536d Optimize get_git_author Gregory Szorc <gregory.szorc@gmail.com> parents: 523 diff changeset	452 author = self.author_map.get(author, author)
450 163ac98569d3 - add "author file" extension, allows an author translation map Mike Bayer <mike_mp@zzzcomputing.com> parents: 448 diff changeset	453
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	454 # check for git author pattern compliance
537 6e05aa1b536d Optimize get_git_author Gregory Szorc <gregory.szorc@gmail.com> parents: 523 diff changeset	455 a = RE_GIT_AUTHOR.match(author)
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	456
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	457 if a:
448 e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	458 name = self.get_valid_git_username_email(a.group(1))
e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	459 email = self.get_valid_git_username_email(a.group(2))
432 ccd38138a3b3 Improve the parsing of author lines from Mercurial to generate committer and author lines that git can correctly understand Ehsan Akhgari <ehsan.akhgari@gmail.com> parents: 429 diff changeset	460 if a.group(3) != None and len(a.group(3)) != 0:
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	461 name += ' ext:(' + urllib.quote(a.group(3)) + ')'
432 ccd38138a3b3 Improve the parsing of author lines from Mercurial to generate committer and author lines that git can correctly understand Ehsan Akhgari <ehsan.akhgari@gmail.com> parents: 429 diff changeset	462 author = self.get_valid_git_username_email(name) + ' <' + self.get_valid_git_username_email(email) + '>'
401 f17ca8ed620c Use author as email when it is an email César Izurieta <cesar@caih.org> parents: 400 diff changeset	463 elif '@' in author:
432 ccd38138a3b3 Improve the parsing of author lines from Mercurial to generate committer and author lines that git can correctly understand Ehsan Akhgari <ehsan.akhgari@gmail.com> parents: 429 diff changeset	464 author = self.get_valid_git_username_email(author) + ' <' + self.get_valid_git_username_email(author) + '>'
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	465 else:
432 ccd38138a3b3 Improve the parsing of author lines from Mercurial to generate committer and author lines that git can correctly understand Ehsan Akhgari <ehsan.akhgari@gmail.com> parents: 429 diff changeset	466 author = self.get_valid_git_username_email(author) + ' <none@none>'
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	467
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	468 if 'author' in ctx.extra():
307 7dfe8be21135 handle apply_delta() return value correctly Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	469 author = "".join(apply_delta(author, ctx.extra()['author']))
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	470
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	471 return author
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	472
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	473 def get_git_parents(self, ctx):
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	474 def is_octopus_part(ctx):
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	475 return ctx.extra().get('hg-git', None) in ('octopus', 'octopus-done')
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	476
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	477 parents = []
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	478 if ctx.extra().get('hg-git', None) == 'octopus-done':
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	479 # implode octopus parents
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	480 part = ctx
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	481 while is_octopus_part(part):
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	482 (p1, p2) = part.parents()
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	483 assert not is_octopus_part(p1)
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	484 parents.append(p1)
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	485 part = p2
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	486 parents.append(p2)
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	487 else:
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	488 parents = ctx.parents()
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	489
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	490 return parents
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	491
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	492 def get_git_message(self, ctx):
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	493 extra = ctx.extra()
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	494
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	495 message = ctx.description() + "\n"
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	496 if 'message' in extra:
307 7dfe8be21135 handle apply_delta() return value correctly Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	497 message = "".join(apply_delta(message, extra['message']))
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	498
54 f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	499 # HG EXTRA INFORMATION
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	500 add_extras = False
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	501 extra_message = ''
54 f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	502 if not ctx.branch() == 'default':
f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	503 add_extras = True
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	504 extra_message += "branch : " + ctx.branch() + "\n"
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	505
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	506 renames = []
247 3c01e07b0252 look for renamed files only in files modified by the commit Abderrahim Kitouni <a.kitouni@gmail.com> parents: 245 diff changeset	507 for f in ctx.files():
3c01e07b0252 look for renamed files only in files modified by the commit Abderrahim Kitouni <a.kitouni@gmail.com> parents: 245 diff changeset	508 if f not in ctx.manifest():
3c01e07b0252 look for renamed files only in files modified by the commit Abderrahim Kitouni <a.kitouni@gmail.com> parents: 245 diff changeset	509 continue
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	510 rename = ctx.filectx(f).renamed()
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	511 if rename:
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	512 renames.append((rename[0], f))
c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	513
67 759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	514 if renames:
759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	515 add_extras = True
759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	516 for oldfile, newfile in renames:
759ac56497e7 adding hg explicit file renames to the git commit message Scott Chacon <schacon@gmail.com> parents: 65 diff changeset	517 extra_message += "rename : " + oldfile + " => " + newfile + "\n"
164 7e98757deadc author and extra data fixes Scott Chacon <schacon@gmail.com> parents: 162 diff changeset	518
7e98757deadc author and extra data fixes Scott Chacon <schacon@gmail.com> parents: 162 diff changeset	519 for key, value in extra.iteritems():
203 104a4fd6a0af trying to fix some of the broken tests Abderrahim Kitouni <a.kitouni@gmail.com> parents: 199 diff changeset	520 if key in ('author', 'committer', 'encoding', 'message', 'branch', 'hg-git'):
164 7e98757deadc author and extra data fixes Scott Chacon <schacon@gmail.com> parents: 162 diff changeset	521 continue
7e98757deadc author and extra data fixes Scott Chacon <schacon@gmail.com> parents: 162 diff changeset	522 else:
181 8690377c3ce9 Various cleanups (mostly whitespace and imports) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 179 diff changeset	523 add_extras = True
164 7e98757deadc author and extra data fixes Scott Chacon <schacon@gmail.com> parents: 162 diff changeset	524 extra_message += "extra : " + key + " : " + urllib.quote(value) + "\n"
7e98757deadc author and extra data fixes Scott Chacon <schacon@gmail.com> parents: 162 diff changeset	525
54 f6e11b9d7562 not adding HG extra info if commits were on the default branch Scott Chacon <schacon@gmail.com> parents: 53 diff changeset	526 if add_extras:
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	527 message += "\n--HG--\n" + extra_message
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	528
239 c5e5e7849803 split out get_git_author, get_git_parents and get_git_message Abderrahim Kitouni <a.kitouni@gmail.com> parents: 238 diff changeset	529 return message
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	530
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	531 def iterblobs(self, ctx):
476 b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	532 if '.hgsubstate' in ctx:
479 5c1d4311440d submodules: only use the ordereddict backport if collections.OrderedDict is unavailable Augie Fackler <raf@durin42.com> parents: 478 diff changeset	533 hgsub = util.OrderedDict()
476 b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	534 if '.hgsub' in ctx:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	535 hgsub = util.parse_hgsub(ctx['.hgsub'].data().splitlines())
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	536 hgsubstate = util.parse_hgsubstate(ctx['.hgsubstate'].data().splitlines())
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	537 for path, sha in hgsubstate.iteritems():
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	538 try:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	539 if path in hgsub and not hgsub[path].startswith('[git]'):
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	540 # some other kind of a repository (e.g. [hg])
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	541 # that keeps its state in .hgsubstate, shall ignore
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	542 continue
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	543 yield path, sha, S_IFGITLINK
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	544 except ValueError:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	545 pass
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	546
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	547 for f in ctx:
476 b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	548 if f == '.hgsubstate' or f == '.hgsub':
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	549 continue
234 6f34aee64a3f readd blob caching (~25% improvement in gexport) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 233 diff changeset	550 fctx = ctx[f]
6f34aee64a3f readd blob caching (~25% improvement in gexport) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 233 diff changeset	551 blobid = self.map_git_get(hex(fctx.filenode()))
6f34aee64a3f readd blob caching (~25% improvement in gexport) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 233 diff changeset	552
6f34aee64a3f readd blob caching (~25% improvement in gexport) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 233 diff changeset	553 if not blobid:
6f34aee64a3f readd blob caching (~25% improvement in gexport) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 233 diff changeset	554 blob = Blob.from_string(fctx.data())
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	555 self.git.object_store.add_object(blob)
234 6f34aee64a3f readd blob caching (~25% improvement in gexport) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 233 diff changeset	556 self.map_set(blob.id, hex(fctx.filenode()))
6f34aee64a3f readd blob caching (~25% improvement in gexport) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 233 diff changeset	557 blobid = blob.id
6f34aee64a3f readd blob caching (~25% improvement in gexport) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 233 diff changeset	558
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	559 if 'l' in ctx.flags(f):
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	560 mode = 0120000
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	561 elif 'x' in ctx.flags(f):
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	562 mode = 0100755
23 ee217d3c6363 will now write all trees and blobs needed. all thats left is commits for basic data conversion Scott Chacon <schacon@gmail.com> parents: 22 diff changeset	563 else:
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	564 mode = 0100644
234 6f34aee64a3f readd blob caching (~25% improvement in gexport) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 233 diff changeset	565
6f34aee64a3f readd blob caching (~25% improvement in gexport) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 233 diff changeset	566 yield f, blobid, mode
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	567
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	568 def getnewgitcommits(self, refs=None):
258 1590c97d7af0 do not init the cache git repo unless needed (fixes issue 16 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 248 diff changeset	569 self.init_if_missing()
1590c97d7af0 do not init the cache git repo unless needed (fixes issue 16 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 248 diff changeset	570
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	571 # import heads and fetched tags as remote references
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	572 todo = []
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	573 done = set()
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	574 convert_list = {}
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	575
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	576 # get a list of all the head shas
282 8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	577 seenheads = set()
8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	578 if refs is None:
288 efe9e6a9235f fix gimport and add test for using to work on hg repos from git (issue 73) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 287 diff changeset	579 refs = self.git.refs.as_dict()
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	580 if refs:
282 8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	581 for sha in refs.itervalues():
8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	582 # refs contains all the refs in the server, not just the ones
8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	583 # we are pulling
8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	584 if sha in self.git.object_store:
8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	585 obj = self.git.get_object(sha)
8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	586 while isinstance(obj, Tag):
337 6cea997ee302 enforce stricter matching for pull -r Tay Ray Chuan <rctay89@gmail.com> parents: 258 diff changeset	587 obj_type, sha = obj.object
282 8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	588 obj = self.git.get_object(sha)
8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	589 if isinstance (obj, Commit) and sha not in seenheads:
8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	590 seenheads.add(sha)
8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	591 todo.append(sha)
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	592
284 12cfa77a2ab0 sort heads by commit date in topological sort Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 283 diff changeset	593 # sort by commit date
12cfa77a2ab0 sort heads by commit date in topological sort Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 283 diff changeset	594 def commitdate(sha):
12cfa77a2ab0 sort heads by commit date in topological sort Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 283 diff changeset	595 obj = self.git.get_object(sha)
12cfa77a2ab0 sort heads by commit date in topological sort Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 283 diff changeset	596 return obj.commit_time-obj.commit_timezone
12cfa77a2ab0 sort heads by commit date in topological sort Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 283 diff changeset	597
12cfa77a2ab0 sort heads by commit date in topological sort Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 283 diff changeset	598 todo.sort(key=commitdate, reverse=True)
12cfa77a2ab0 sort heads by commit date in topological sort Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 283 diff changeset	599
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	600 # traverse the heads getting a list of all the unique commits
283 90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	601 commits = []
90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	602 seen = set(todo)
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	603 while todo:
283 90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	604 sha = todo[-1]
90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	605 if sha in done:
90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	606 todo.pop()
90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	607 continue
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	608 assert isinstance(sha, str)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	609 obj = self.git.get_object(sha)
282 8655c071a15d make sure no tag object are included in the DAG we build Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 276 diff changeset	610 assert isinstance(obj, Commit)
283 90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	611 for p in obj.parents:
90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	612 if p not in done:
90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	613 todo.append(p)
90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	614 break
90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	615 else:
90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	616 commits.append(sha)
90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	617 convert_list[sha] = obj
90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	618 done.add(sha)
90458271e374 use a simple toposort algorithm for DAG (post order from a DFS from the heads) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 282 diff changeset	619 todo.pop()
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	620
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	621 return convert_list, [commit for commit in commits if not commit in self._map_git]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	622
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	623 def import_git_objects(self, remote_name=None, refs=None):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: 406 diff changeset	624 convert_list, commits = self.getnewgitcommits(refs)
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	625 # import each of the commits, oldest first
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	626 total = len(commits)
392 8bb058d6a9ee Message cleanups Brendan Cully <brendan@kublai.com> parents: 391 diff changeset	627 if total:
8bb058d6a9ee Message cleanups Brendan Cully <brendan@kublai.com> parents: 391 diff changeset	628 self.ui.status(_("importing git objects into hg\n"))
8bb058d6a9ee Message cleanups Brendan Cully <brendan@kublai.com> parents: 391 diff changeset	629
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	630 for i, csha in enumerate(commits):
374 f008197045d3 progress: use gerund form for import timeless <timeless@gmail.com> parents: 369 diff changeset	631 util.progress(self.ui, 'importing', i, total=total, unit='commits')
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	632 commit = convert_list[csha]
190 6fbdf1afe032 Better reporting of the number of commits to convert Abderrahim Kitouni <a.kitouni@gmail.com> parents: 188 diff changeset	633 self.import_git_commit(commit)
374 f008197045d3 progress: use gerund form for import timeless <timeless@gmail.com> parents: 369 diff changeset	634 util.progress(self.ui, 'importing', None, total=total, unit='commits')
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	635
400 6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	636 # Remove any dangling tag references.
6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	637 for name, rev in self.repo.tags().items():
6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	638 if not rev in self.repo:
6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	639 if hasattr(self, 'tagscache') and self.tagscache and \
6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	640 'name' in self.tagscache:
6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	641 # Mercurial 1.4 and earlier.
6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	642 del self.repo.tagscache[name]
6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	643 elif hasattr(self, '_tags') and self._tags and \
6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	644 'name' in self._tags:
6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	645 # Mercurial 1.5 and later.
6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	646 del self.repo._tags[name]
475 03d8e33bf776 git_handler: fix safehasattr - hg util is hgutil Mads Kiilerich <mads@kiilerich.com> parents: 460 diff changeset	647 if (hgutil.safehasattr(self.repo, '_tagtypes') and
460 5861777f2f5e git_handler: fix import_git_objects for Mercurial 2.0+ (issue 36) Kevin Bullock <kbullock@ringworld.org> parents: 456 diff changeset	648 self.repo._tagtypes and
5861777f2f5e git_handler: fix import_git_objects for Mercurial 2.0+ (issue 36) Kevin Bullock <kbullock@ringworld.org> parents: 456 diff changeset	649 name in self.repo._tagtypes):
5861777f2f5e git_handler: fix import_git_objects for Mercurial 2.0+ (issue 36) Kevin Bullock <kbullock@ringworld.org> parents: 456 diff changeset	650 # Mercurial 1.9 and earlier.
400 6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	651 del self.repo._tagtypes[name]
475 03d8e33bf776 git_handler: fix safehasattr - hg util is hgutil Mads Kiilerich <mads@kiilerich.com> parents: 460 diff changeset	652 elif (hgutil.safehasattr(self.repo, 'tagscache') and
460 5861777f2f5e git_handler: fix import_git_objects for Mercurial 2.0+ (issue 36) Kevin Bullock <kbullock@ringworld.org> parents: 456 diff changeset	653 self.repo.tagscache and
475 03d8e33bf776 git_handler: fix safehasattr - hg util is hgutil Mads Kiilerich <mads@kiilerich.com> parents: 460 diff changeset	654 hgutil.safehasattr(self.repo.tagscache, '_tagtypes') and
460 5861777f2f5e git_handler: fix import_git_objects for Mercurial 2.0+ (issue 36) Kevin Bullock <kbullock@ringworld.org> parents: 456 diff changeset	655 self.repo.tagscache._tagtypes and
5861777f2f5e git_handler: fix import_git_objects for Mercurial 2.0+ (issue 36) Kevin Bullock <kbullock@ringworld.org> parents: 456 diff changeset	656 name in self.repo.tagscache._tagtypes):
5861777f2f5e git_handler: fix import_git_objects for Mercurial 2.0+ (issue 36) Kevin Bullock <kbullock@ringworld.org> parents: 456 diff changeset	657 # Mercurial 2.0 and later.
5861777f2f5e git_handler: fix import_git_objects for Mercurial 2.0+ (issue 36) Kevin Bullock <kbullock@ringworld.org> parents: 456 diff changeset	658 del self.repo.tagscache._tagtypes[name]
400 6d4f3b6d2e08 respect references to tags that differ between git and .hgtags Adrian Sampson <adrian@radbox.org> parents: 398 diff changeset	659
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	660 def import_git_commit(self, commit):
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	661 self.ui.debug(_("importing: %s\n") % commit.id)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	662
293 8aaae306d46f git_handler: 80 columns cleanup Augie Fackler <durin42@gmail.com> parents: 292 diff changeset	663 (strip_message, hg_renames,
8aaae306d46f git_handler: 80 columns cleanup Augie Fackler <durin42@gmail.com> parents: 292 diff changeset	664 hg_branch, extra) = self.extract_hg_metadata(commit.message)
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	665
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	666 # get a list of the changed, added, removed files
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	667 files = self.get_files_changed(commit)
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	668
476 b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	669 # Handle gitlinks: collect
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	670 gitlinks = self.collect_gitlinks(commit.tree)
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	671 git_commit_tree = self.git[commit.tree]
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	672
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	673 # Analyze hgsubstate and build an updated version
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	674 # using SHAs from gitlinks
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	675 hgsubstate = None
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	676 if gitlinks:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	677 hgsubstate = util.parse_hgsubstate(self.git_file_readlines(git_commit_tree, '.hgsubstate'))
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	678 for path, sha in gitlinks:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	679 hgsubstate[path] = sha
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	680 # in case .hgsubstate wasn't among changed files
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	681 # force its inclusion
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	682 files['.hgsubstate'] = (False, 0100644, None)
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	683
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	684 # Analyze .hgsub and merge with .gitmodules
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	685 hgsub = None
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	686 gitmodules = self.parse_gitmodules(git_commit_tree)
478 64eb2789e5bf git_handler: remove tab character that snuck in Augie Fackler <raf@durin42.com> parents: 476 diff changeset	687 if gitmodules or gitlinks:
476 b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	688 hgsub = util.parse_hgsub(self.git_file_readlines(git_commit_tree, '.hgsub'))
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	689 for (sm_path, sm_url, sm_name) in gitmodules:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	690 hgsub[sm_path] = '[git]' + sm_url
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	691 files['.hgsub'] = (False, 0100644, None)
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	692 elif commit.parents and '.gitmodules' in self.git[self.git[commit.parents[0]].tree]:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	693 # no .gitmodules in this commit, however present in the parent
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	694 # mark its hg counterpart as deleted (assuming .hgsub is there
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	695 # due to the same import_git_commit process
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	696 files['.hgsub'] = (True, 0100644, None)
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	697
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	698 date = (commit.author_time, -commit.author_timezone)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	699 text = strip_message
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	700
226 3b8804c59b63 drop untested commit_import_ctx (use commitctx instead). Abderrahim Kitouni <a.kitouni@gmail.com> parents: 225 diff changeset	701 origtext = text
186 f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	702 try:
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	703 text.decode('utf-8')
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	704 except UnicodeDecodeError:
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	705 text = self.decode_guess(text, commit.encoding)
226 3b8804c59b63 drop untested commit_import_ctx (use commitctx instead). Abderrahim Kitouni <a.kitouni@gmail.com> parents: 225 diff changeset	706
3b8804c59b63 drop untested commit_import_ctx (use commitctx instead). Abderrahim Kitouni <a.kitouni@gmail.com> parents: 225 diff changeset	707 text = '\n'.join([l.rstrip() for l in text.splitlines()]).strip('\n')
3b8804c59b63 drop untested commit_import_ctx (use commitctx instead). Abderrahim Kitouni <a.kitouni@gmail.com> parents: 225 diff changeset	708 if text + '\n' != origtext:
3b8804c59b63 drop untested commit_import_ctx (use commitctx instead). Abderrahim Kitouni <a.kitouni@gmail.com> parents: 225 diff changeset	709 extra['message'] = create_delta(text +'\n', origtext)
186 f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	710
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	711 author = commit.author
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	712
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	713 # convert extra data back to the end
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	714 if ' ext:' in commit.author:
540 3fb942852b1c Precompile Git author extra data regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 539 diff changeset	715 m = RE_GIT_AUTHOR_EXTRA.match(commit.author)
186 f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	716 if m:
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	717 name = m.group(1)
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	718 ex = urllib.unquote(m.group(2))
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	719 email = m.group(3)
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	720 author = name + ' <' + email + '>' + ex
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	721
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	722 if ' <none@none>' in commit.author:
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	723 author = commit.author[:-12]
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	724
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	725 try:
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	726 author.decode('utf-8')
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	727 except UnicodeDecodeError:
225 cde57730faa7 store non utf-8 encoded author/commit message as deltas Abderrahim Kitouni <a.kitouni@gmail.com> parents: 224 diff changeset	728 origauthor = author
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	729 author = self.decode_guess(author, commit.encoding)
225 cde57730faa7 store non utf-8 encoded author/commit message as deltas Abderrahim Kitouni <a.kitouni@gmail.com> parents: 224 diff changeset	730 extra['author'] = create_delta(author, origauthor)
186 f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	731
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	732 oldenc = self.swap_out_encoding()
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	733
406 50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	734 def findconvergedfiles(p1, p2):
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	735 # If any files have the same contents in both parents of a merge
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	736 # (and are therefore not reported as changed by Git) but are at
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	737 # different file revisions in Mercurial (because they arrived at
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	738 # those contents in different ways), we need to include them in
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	739 # the list of changed files so that Mercurial can join up their
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	740 # filelog histories (same as if the merge was done in Mercurial to
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	741 # begin with).
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	742 if p2 == nullid:
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	743 return []
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	744 manifest1 = self.repo.changectx(p1).manifest()
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	745 manifest2 = self.repo.changectx(p2).manifest()
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	746 return [path for path, node1 in manifest1.iteritems()
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	747 if path not in files and manifest2.get(path, node1) != node1]
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	748
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	749 def getfilectx(repo, memctx, f):
406 50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	750 info = files.get(f)
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	751 if info != None:
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	752 # it's a file reported as modified from Git
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	753 delete, mode, sha = info
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	754 if delete:
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	755 raise IOError
275 c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	756
476 b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	757 if not sha: # indicates there's no git counterpart
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	758 e = ''
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	759 copied_path = None
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	760 if '.hgsubstate' == f:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	761 data = util.serialize_hgsubstate(hgsubstate)
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	762 elif '.hgsub' == f:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	763 data = util.serialize_hgsub(hgsub)
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	764 else:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	765 data = self.git[sha].data
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	766 copied_path = hg_renames.get(f)
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	767 e = self.convert_git_int_mode(mode)
406 50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	768 else:
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	769 # it's a converged file
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	770 fc = context.filectx(self.repo, f, changeid=memctx.p1().rev())
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	771 data = fc.data()
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	772 e = fc.flags()
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	773 copied_path = fc.renamed()
275 c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	774
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	775 return context.memfilectx(f, data, 'l' in e, 'x' in e, copied_path)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	776
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	777 gparents = map(self.map_hg_get, commit.parents)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	778 p1, p2 = (nullid, nullid)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	779 octopus = False
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	780
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	781 if len(gparents) > 1:
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	782 # merge, possibly octopus
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	783 def commit_octopus(p1, p2):
406 50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	784 ctx = context.memctx(self.repo, (p1, p2), text,
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	785 list(files) + findconvergedfiles(p1, p2),
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	786 getfilectx, author, date, {'hg-git': 'octopus'})
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	787 return hex(self.repo.commitctx(ctx))
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	788
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	789 octopus = len(gparents) > 2
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	790 p2 = gparents.pop()
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	791 p1 = gparents.pop()
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	792 while len(gparents) > 0:
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	793 p2 = commit_octopus(p1, p2)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	794 p1 = gparents.pop()
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	795 else:
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	796 if gparents:
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	797 p1 = gparents.pop()
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	798
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	799 pa = None
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	800 if not (p2 == nullid):
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	801 node1 = self.repo.changectx(p1)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	802 node2 = self.repo.changectx(p2)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	803 pa = node1.ancestor(node2)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	804
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	805 # if named branch, add to extra
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	806 if hg_branch:
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	807 extra['branch'] = hg_branch
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	808
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	809 # if committer is different than author, add it to extra
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	810 if commit.author != commit.committer \
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	811 or commit.author_time != commit.commit_time \
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	812 or commit.author_timezone != commit.commit_timezone:
293 8aaae306d46f git_handler: 80 columns cleanup Augie Fackler <durin42@gmail.com> parents: 292 diff changeset	813 extra['committer'] = "%s %d %d" % (
8aaae306d46f git_handler: 80 columns cleanup Augie Fackler <durin42@gmail.com> parents: 292 diff changeset	814 commit.committer, commit.commit_time, -commit.commit_timezone)
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	815
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	816 if commit.encoding:
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	817 extra['encoding'] = commit.encoding
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	818
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	819 if hg_branch:
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	820 extra['branch'] = hg_branch
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	821
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	822 if octopus:
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	823 extra['hg-git'] ='octopus-done'
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	824
300 eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	825 # TODO use 'n in self.repo' when we require hg 1.5
eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	826 def repo_contains(n):
eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	827 try:
eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	828 return bool(self.repo.lookup(n))
eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	829 except error.RepoLookupError:
eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	830 return False
eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	831
eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	832 if not (repo_contains(p1) and repo_contains(p2)):
eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	833 raise hgutil.Abort(_('you appear to have run strip - '
eec31dee258e Various hg 1.4 compat fixes. Augie Fackler <durin42@gmail.com> parents: 298 diff changeset	834 'please run hg git-cleanup'))
406 50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	835 ctx = context.memctx(self.repo, (p1, p2), text,
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	836 list(files) + findconvergedfiles(p1, p2),
50698ff64c41 Fix round-trip fidelity for merges of converged files. Christian Walther <cwalther@gmx.ch> parents: 401 diff changeset	837 getfilectx, author, date, extra)
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	838
226 3b8804c59b63 drop untested commit_import_ctx (use commitctx instead). Abderrahim Kitouni <a.kitouni@gmail.com> parents: 225 diff changeset	839 node = self.repo.commitctx(ctx)
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	840
186 f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	841 self.swap_out_encoding(oldenc)
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	842
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	843 # save changeset to mapping file
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	844 cs = hex(node)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	845 self.map_set(commit.id, cs)
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	846
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	847 ## PACK UPLOADING AND FETCHING
19 2be9c0bd88af Warn, but don't fail when bookmarks is not enabled. Augie Fackler <durin42@gmail.com> parents: 17 diff changeset	848
230 51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	849 def upload_pack(self, remote, revs, force):
184 7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	850 client, path = self.get_transport_and_path(remote)
487 68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	851 old_refs = {}
230 51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	852 def changed(refs):
487 68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	853 old_refs.update(refs)
230 51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	854 to_push = revs or set(self.local_heads().values() + self.tags.values())
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	855 return self.get_changed_refs(refs, to_push, force)
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	856
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	857 genpack = self.git.object_store.generate_pack_contents
26 a1a5391bc3c3 edit ssh command to quote the path, also convert tags properly on fetch Scott Chacon <schacon@gmail.com> parents: 25 diff changeset	858 try:
95 7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	859 self.ui.status(_("creating and sending data\n"))
487 68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	860 new_refs = client.send_pack(path, changed, genpack)
68e5dddc7a20 push: return 1 if no changes found, 0 if success David M. Carr <david@carrclan.us> parents: 475 diff changeset	861 return old_refs, new_refs
394 721165a45385 Catch GitProtocolError wherever HangupException can occur. Brendan Cully <brendan@kublai.com> parents: 392 diff changeset	862 except (HangupException, GitProtocolError), e:
721165a45385 Catch GitProtocolError wherever HangupException can occur. Brendan Cully <brendan@kublai.com> parents: 392 diff changeset	863 raise hgutil.Abort(_("git remote error: ") + str(e))
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	864
230 51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	865 def get_changed_refs(self, refs, revs, force):
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	866 new_refs = refs.copy()
242 0ac974306e08 push the tip to master if remote repository is empty (closes issue 11 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 239 diff changeset	867
0ac974306e08 push the tip to master if remote repository is empty (closes issue 11 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 239 diff changeset	868 #The remote repo is empty and the local one doesn't have bookmarks/tags
248 bfe6fd2fdb9b push tip to master in an empty repository even if there are tags Abderrahim Kitouni <a.kitouni@gmail.com> parents: 247 diff changeset	869 if refs.keys()[0] == 'capabilities^{}':
242 0ac974306e08 push the tip to master if remote repository is empty (closes issue 11 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 239 diff changeset	870 del new_refs['capabilities^{}']
248 bfe6fd2fdb9b push tip to master in an empty repository even if there are tags Abderrahim Kitouni <a.kitouni@gmail.com> parents: 247 diff changeset	871 if not self.local_heads():
bfe6fd2fdb9b push tip to master in an empty repository even if there are tags Abderrahim Kitouni <a.kitouni@gmail.com> parents: 247 diff changeset	872 tip = hex(self.repo.lookup('tip'))
380 249ee603cb5c Indenting fix DontCare4Free <webmaster@dontcare4free.tk> parents: 379 diff changeset	873 try:
249ee603cb5c Indenting fix DontCare4Free <webmaster@dontcare4free.tk> parents: 379 diff changeset	874 commands.bookmark(self.ui, self.repo, 'master', tip, force=True)
249ee603cb5c Indenting fix DontCare4Free <webmaster@dontcare4free.tk> parents: 379 diff changeset	875 except NameError:
249ee603cb5c Indenting fix DontCare4Free <webmaster@dontcare4free.tk> parents: 379 diff changeset	876 bookmarks.bookmark(self.ui, self.repo, 'master', tip, force=True)
248 bfe6fd2fdb9b push tip to master in an empty repository even if there are tags Abderrahim Kitouni <a.kitouni@gmail.com> parents: 247 diff changeset	877 bookmarks.setcurrent(self.repo, 'master')
bfe6fd2fdb9b push tip to master in an empty repository even if there are tags Abderrahim Kitouni <a.kitouni@gmail.com> parents: 247 diff changeset	878 new_refs['refs/heads/master'] = self.map_git_get(tip)
242 0ac974306e08 push the tip to master if remote repository is empty (closes issue 11 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 239 diff changeset	879
230 51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	880 for rev in revs:
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	881 ctx = self.repo[rev]
376 b4f5f2729acb git_handler: update ctx label handling for bookmarks in core Augie Fackler <durin42@gmail.com> parents: 375 diff changeset	882 if getattr(ctx, 'bookmarks', None):
441 35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	883 labels = lambda c: ctx.tags() + [
448 e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	884 fltr for fltr, bm
441 35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	885 in self._filter_for_bookmarks(ctx.bookmarks())
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	886 ]
376 b4f5f2729acb git_handler: update ctx label handling for bookmarks in core Augie Fackler <durin42@gmail.com> parents: 375 diff changeset	887 else:
b4f5f2729acb git_handler: update ctx label handling for bookmarks in core Augie Fackler <durin42@gmail.com> parents: 375 diff changeset	888 labels = lambda c: ctx.tags()
381 80544310834a fix handling of spaces in hg tag names Dmitry Gladkov <dmitry.gladkov@gmail.com> parents: 376 diff changeset	889 prep = lambda itr: [i.replace(' ', '_') for i in itr]
80544310834a fix handling of spaces in hg tag names Dmitry Gladkov <dmitry.gladkov@gmail.com> parents: 376 diff changeset	890
80544310834a fix handling of spaces in hg tag names Dmitry Gladkov <dmitry.gladkov@gmail.com> parents: 376 diff changeset	891 heads = [t for t in prep(labels(ctx)) if t in self.local_heads()]
80544310834a fix handling of spaces in hg tag names Dmitry Gladkov <dmitry.gladkov@gmail.com> parents: 376 diff changeset	892 tags = [t for t in prep(labels(ctx)) if t in self.tags]
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	893
230 51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	894 if not (heads or tags):
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	895 raise hgutil.Abort("revision %s cannot be pushed since"
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	896 " it doesn't have a ref" % ctx)
149 eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	897
310 53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	898 # Check if the tags the server is advertising are annotated tags,
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	899 # by attempting to retrieve it from the our git repo, and building a
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	900 # list of these tags.
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	901 #
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	902 # This is possible, even though (currently) annotated tags are
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	903 # dereferenced and stored as lightweight ones, as the annotated tag
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	904 # is still stored in the git repo.
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	905 uptodate_annotated_tags = []
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	906 for r in tags:
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	907 ref = 'refs/tags/'+r
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	908 # Check tag.
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	909 if not ref in refs:
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	910 continue
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	911 try:
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	912 # We're not using Repo.tag(), as it's deprecated.
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	913 tag = self.git.get_object(refs[ref])
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	914 if not isinstance(tag, Tag):
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	915 continue
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	916 except KeyError:
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	917 continue
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	918
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	919 # If we've reached here, the tag's good.
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	920 uptodate_annotated_tags.append(ref)
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	921
230 51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	922 for r in heads + tags:
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	923 if r in heads:
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	924 ref = 'refs/heads/'+r
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	925 else:
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	926 ref = 'refs/tags/'+r
181 8690377c3ce9 Various cleanups (mostly whitespace and imports) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 179 diff changeset	927
230 51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	928 if ref not in refs:
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	929 new_refs[ref] = self.map_git_get(ctx.hex())
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	930 elif new_refs[ref] in self._map_git:
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	931 rctx = self.repo[self.map_hg_get(new_refs[ref])]
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	932 if rctx.ancestor(ctx) == rctx or force:
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	933 new_refs[ref] = self.map_git_get(ctx.hex())
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	934 else:
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	935 raise hgutil.Abort("pushing %s overwrites %s"
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	936 % (ref, ctx))
310 53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	937 elif ref in uptodate_annotated_tags:
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	938 # we already have the annotated tag.
53b0d608dcd5 when pushing, check if server is advertising annotated tags Tay Ray Chuan <rctay89@gmail.com> parents: 302 diff changeset	939 pass
230 51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	940 else:
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	941 raise hgutil.Abort("%s changed on the server, please pull "
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	942 "and merge before pushing" % ref)
126 705b88c9f3d1 remote branches to server Ian Dees <undees@gmail.com> parents: 125 diff changeset	943
230 51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	944 return new_refs
51e4d6ebbc40 rework pushing to support --rev and --force options Abderrahim Kitouni <a.kitouni@gmail.com> parents: 229 diff changeset	945
50 d274092e3b24 Hacky implementation of file removals. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	946
232 0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	947 def fetch_pack(self, remote_name, heads):
182 9bdd8e76bbab Remove remotes support (use the paths section in hgrc instead) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 181 diff changeset	948 client, path = self.get_transport_and_path(remote_name)
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	949 graphwalker = self.git.get_graph_walker()
232 0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	950 def determine_wants(refs):
0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	951 if heads:
0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	952 want = []
337 6cea997ee302 enforce stricter matching for pull -r Tay Ray Chuan <rctay89@gmail.com> parents: 258 diff changeset	953 # contains pairs of ('refs/(heads\|tags\|...)/foo', 'foo')
6cea997ee302 enforce stricter matching for pull -r Tay Ray Chuan <rctay89@gmail.com> parents: 258 diff changeset	954 # if ref is just '<foo>', then we get ('foo', 'foo')
6cea997ee302 enforce stricter matching for pull -r Tay Ray Chuan <rctay89@gmail.com> parents: 258 diff changeset	955 stripped_refs = [
6cea997ee302 enforce stricter matching for pull -r Tay Ray Chuan <rctay89@gmail.com> parents: 258 diff changeset	956 (r, r[r.find('/', r.find('/')+1)+1:])
6cea997ee302 enforce stricter matching for pull -r Tay Ray Chuan <rctay89@gmail.com> parents: 258 diff changeset	957 for r in refs]
232 0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	958 for h in heads:
337 6cea997ee302 enforce stricter matching for pull -r Tay Ray Chuan <rctay89@gmail.com> parents: 258 diff changeset	959 r = [pair[0] for pair in stripped_refs if pair[1] == h]
232 0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	960 if not r:
292 19f201d64a16 git_handler: fix % formatting in ref errors. Augie Fackler <durin42@gmail.com> parents: 288 diff changeset	961 raise hgutil.Abort("ref %s not found on remote server" % h)
232 0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	962 elif len(r) == 1:
0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	963 want.append(refs[r[0]])
0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	964 else:
292 19f201d64a16 git_handler: fix % formatting in ref errors. Augie Fackler <durin42@gmail.com> parents: 288 diff changeset	965 raise hgutil.Abort("ambiguous reference %s: %r" % (h, r))
232 0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	966 else:
0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	967 want = [sha for ref, sha in refs.iteritems()
417 65b414ab988c only want heads and tags Scott Chacon <schacon@gmail.com> parents: 415 diff changeset	968 if not ref.endswith('^{}')
65b414ab988c only want heads and tags Scott Chacon <schacon@gmail.com> parents: 415 diff changeset	969 and ( ref.startswith('refs/heads/') or ref.startswith('refs/tags/') ) ]
395 01c9eeedde04 Only fetch objects that are not already present. Brendan Cully <brendan@kublai.com> parents: 394 diff changeset	970 want = [x for x in want if x not in self.git]
232 0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	971 return want
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	972 f, commit = self.git.object_store.add_pack()
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	973 try:
266 5347d8c94021 python 2.4 syntax fix Antonin Amand <antonin.amand@gmail.com> parents: 261 diff changeset	974 try:
411 de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	975 progress = GitProgress(self.ui)
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	976 ret = client.fetch_pack(path, determine_wants, graphwalker,
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	977 f.write, progress.progress)
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	978 progress.flush()
de7317967598 Convert dulwich progress into mercurial ui.progress Brendan Cully <brendan@kublai.com> parents: 408 diff changeset	979 return ret
394 721165a45385 Catch GitProtocolError wherever HangupException can occur. Brendan Cully <brendan@kublai.com> parents: 392 diff changeset	980 except (HangupException, GitProtocolError), e:
721165a45385 Catch GitProtocolError wherever HangupException can occur. Brendan Cully <brendan@kublai.com> parents: 392 diff changeset	981 raise hgutil.Abort(_("git remote error: ") + str(e))
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	982 finally:
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	983 commit()
d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	984
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	985 ## REFERENCES HANDLING
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	986
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	987 def update_references(self):
195 e09d71dc4cb4 Drop importbranch/exportbranch options (exportbranch was really broken) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 194 diff changeset	988 heads = self.local_heads()
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	989
195 e09d71dc4cb4 Drop importbranch/exportbranch options (exportbranch was really broken) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 194 diff changeset	990 # Create a local Git branch name for each
e09d71dc4cb4 Drop importbranch/exportbranch options (exportbranch was really broken) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 194 diff changeset	991 # Mercurial bookmark.
e09d71dc4cb4 Drop importbranch/exportbranch options (exportbranch was really broken) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 194 diff changeset	992 for key in heads:
418 10027b50202b In some situations where a reference is being used but does not exist in _map_git or _map_hg, silently skip the reference rather than throwing an error. This allows hg outgoing to work on repositories which do not contain any revisions at all. mcc <andrew.mcclure@gmail.com> parents: 415 diff changeset	993 git_ref = self.map_git_get(heads[key])
10027b50202b In some situations where a reference is being used but does not exist in _map_git or _map_hg, silently skip the reference rather than throwing an error. This allows hg outgoing to work on repositories which do not contain any revisions at all. mcc <andrew.mcclure@gmail.com> parents: 415 diff changeset	994 if git_ref:
10027b50202b In some situations where a reference is being used but does not exist in _map_git or _map_hg, silently skip the reference rather than throwing an error. This allows hg outgoing to work on repositories which do not contain any revisions at all. mcc <andrew.mcclure@gmail.com> parents: 415 diff changeset	995 self.git.refs['refs/heads/' + key] = self.map_git_get(heads[key])
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	996
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	997 def export_hg_tags(self):
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	998 for tag, sha in self.repo.tags().iteritems():
210 9a27c618d0ed remove broken tagging code (see issue 3 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 207 diff changeset	999 if self.repo.tagtype(tag) in ('global', 'git'):
381 80544310834a fix handling of spaces in hg tag names Dmitry Gladkov <dmitry.gladkov@gmail.com> parents: 376 diff changeset	1000 tag = tag.replace(' ', '_')
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1001 self.git.refs['refs/tags/' + tag] = self.map_git_get(hex(sha))
212 174954c187e0 fix pushing tags to git (see issue 3 bb) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 210 diff changeset	1002 self.tags[tag] = hex(sha)
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	1003
441 35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1004 def _filter_for_bookmarks(self, bms):
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1005 if not self.branch_bookmark_suffix:
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1006 return [(bm, bm) for bm in bms]
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1007 else:
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1008 def _filter_bm(bm):
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1009 if bm.endswith(self.branch_bookmark_suffix):
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1010 return bm[0:-(len(self.branch_bookmark_suffix))]
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1011 else:
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1012 return bm
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1013 return [(_filter_bm(bm), bm) for bm in bms]
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1014
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	1015 def local_heads(self):
194 a5c53e94d92b Do not depend on the cache git repository for reference pushing Abderrahim Kitouni <a.kitouni@gmail.com> parents: 190 diff changeset	1016 try:
268 6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1017 if getattr(bookmarks, 'parse', None):
6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1018 bms = bookmarks.parse(self.repo)
6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1019 else:
6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1020 bms = self.repo._bookmarks
448 e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	1021 return dict([(filtered_bm, hex(bms[bm])) for
441 35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1022 filtered_bm, bm in self._filter_for_bookmarks(bms)])
215 b5d4d1552765 add some annotations for test coverage Abderrahim Kitouni <a.kitouni@gmail.com> parents: 213 diff changeset	1023 except AttributeError: #pragma: no cover
194 a5c53e94d92b Do not depend on the cache git repository for reference pushing Abderrahim Kitouni <a.kitouni@gmail.com> parents: 190 diff changeset	1024 return {}
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	1025
187 5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	1026 def import_tags(self, refs):
149 eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1027 keys = refs.keys()
eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1028 if not keys:
187 5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	1029 return
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	1030 for k in keys[:]:
149 eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1031 ref_name = k
eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1032 parts = k.split('/')
194 a5c53e94d92b Do not depend on the cache git repository for reference pushing Abderrahim Kitouni <a.kitouni@gmail.com> parents: 190 diff changeset	1033 if parts[0] == 'refs' and parts[1] == 'tags':
149 eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1034 ref_name = "/".join([v for v in parts[2:]])
232 0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	1035 # refs contains all the refs in the server, not just
0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	1036 # the ones we are pulling
0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	1037 if refs[k] not in self.git.object_store:
0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	1038 continue
149 eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1039 if ref_name[-3:] == '^{}':
eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1040 ref_name = ref_name[:-3]
eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1041 if not ref_name in self.repo.tags():
eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1042 obj = self.git.get_object(refs[k])
eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1043 sha = None
eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1044 if isinstance (obj, Commit): # lightweight
eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1045 sha = self.map_hg_get(refs[k])
187 5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	1046 self.tags[ref_name] = sha
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	1047 elif isinstance (obj, Tag): # annotated
337 6cea997ee302 enforce stricter matching for pull -r Tay Ray Chuan <rctay89@gmail.com> parents: 258 diff changeset	1048 (obj_type, obj_sha) = obj.object
149 eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1049 obj = self.git.get_object(obj_sha)
181 8690377c3ce9 Various cleanups (mostly whitespace and imports) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 179 diff changeset	1050 if isinstance (obj, Commit):
149 eb1fcdb8fc9b added basic tag support Scott Chacon <schacon@gmail.com> parents: 148 diff changeset	1051 sha = self.map_hg_get(obj_sha)
187 5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	1052 # TODO: better handling for annotated tags
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	1053 self.tags[ref_name] = sha
5f196f80ffb3 Store git tags in .hg/git-tags and let localtags be local Abderrahim Kitouni <a.kitouni@gmail.com> parents: 186 diff changeset	1054 self.save_tags()
181 8690377c3ce9 Various cleanups (mostly whitespace and imports) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 179 diff changeset	1055
184 7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1056 def update_hg_bookmarks(self, refs):
29 2a5c0bf0fef5 Another way of fixing no-bookmark issue, along with updated test. Augie Fackler <durin42@gmail.com> parents: 28 diff changeset	1057 try:
268 6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1058 oldbm = getattr(bookmarks, 'parse', None)
6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1059 if oldbm:
6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1060 bms = bookmarks.parse(self.repo)
6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1061 else:
6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1062 bms = self.repo._bookmarks
441 35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1063
184 7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1064 heads = dict([(ref[11:],refs[ref]) for ref in refs
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1065 if ref.startswith('refs/heads/')])
156 a507384308b2 Allow bookmarking a specific branch Sverre Rabbelier <sverre@rabbelier.nl> parents: 155 diff changeset	1066
a507384308b2 Allow bookmarking a specific branch Sverre Rabbelier <sverre@rabbelier.nl> parents: 155 diff changeset	1067 for head, sha in heads.iteritems():
232 0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	1068 # refs contains all the refs in the server, not just
0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	1069 # the ones we are pulling
0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	1070 if sha not in self.git.object_store:
0ba1aee0467c initial support for pull -r Abderrahim Kitouni <a.kitouni@gmail.com> parents: 231 diff changeset	1071 continue
188 5d48a2310e16 Use mercurial.node.bin instead of dulwich.objects.hex_to_sha Abderrahim Kitouni <a.kitouni@gmail.com> parents: 187 diff changeset	1072 hgsha = bin(self.map_hg_get(sha))
184 7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1073 if not head in bms:
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1074 # new branch
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1075 bms[head] = hgsha
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1076 else:
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1077 bm = self.repo[bms[head]]
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1078 if bm.ancestor(self.repo[hgsha]) == bm:
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1079 # fast forward
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1080 bms[head] = hgsha
441 35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1081
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1082 # if there's a branch bookmark suffix,
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1083 # then add it on to all bookmark names
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1084 # that would otherwise conflict with a branch
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1085 # name
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1086 if self.branch_bookmark_suffix:
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1087 real_branch_names = self.repo.branchmap()
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1088 bms = dict(
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1089 (
448 e58a6d0b80e2 Remove illegal characters from username/email Keshav Kini <keshav.kini@gmail.com> parents: 447 diff changeset	1090 bm_name + self.branch_bookmark_suffix
441 35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1091 if bm_name in real_branch_names
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1092 else bm_name,
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1093 bms[bm_name]
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1094 )
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1095 for bm_name in bms
35e2813f58a5 - add "branch_bookmark_names" parameter. this allows bookmarks Mike Bayer <mike_mp@zzzcomputing.com> parents: 439 diff changeset	1096 )
156 a507384308b2 Allow bookmarking a specific branch Sverre Rabbelier <sverre@rabbelier.nl> parents: 155 diff changeset	1097 if heads:
268 6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1098 if oldbm:
6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1099 bookmarks.write(self.repo, bms)
6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1100 else:
6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1101 self.repo._bookmarks = bms
6fded8e42858 git_handler: update for slight API change in bookmarks Augie Fackler <durin42@gmail.com> parents: 267 diff changeset	1102 bookmarks.write(self.repo)
161 134915637cf7 Merge branch 'octo' with octo merge code Scott Chacon <schacon@gmail.com> parents: 157 160 diff changeset	1103
29 2a5c0bf0fef5 Another way of fixing no-bookmark issue, along with updated test. Augie Fackler <durin42@gmail.com> parents: 28 diff changeset	1104 except AttributeError:
95 7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	1105 self.ui.warn(_('creating bookmarks failed, do you have'
7de67fcb18b0 be better about internationalizing strings Sverre Rabbelier <sverre@rabbelier.nl> parents: 94 diff changeset	1106 ' bookmarks enabled?\n'))
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	1107
184 7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1108 def update_remote_branches(self, remote_name, refs):
367 699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1109 tagfile = self.repo.join(os.path.join('git-remote-refs'))
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1110 tags = self.repo.gitrefs()
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1111 # since we re-write all refs for this remote each time, prune
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1112 # all entries matching this remote from our tags list now so
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1113 # that we avoid any stale refs hanging around forever
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1114 for t in list(tags):
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1115 if t.startswith(remote_name + '/'):
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1116 del tags[t]
368 ae78f94f64fd Fix bug where remote ref map wrote out binary nodes. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	1117 tags = dict((k, hex(v)) for k, v in tags.iteritems())
367 699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1118 store = self.git.object_store
305 ad2ea8d6ef94 update_remote_branches: refactor head usage Tay Ray Chuan <rctay89@gmail.com> parents: 304 diff changeset	1119 for ref_name, sha in refs.iteritems():
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1120 if ref_name.startswith('refs/heads'):
367 699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1121 if sha not in store:
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1122 continue
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1123 hgsha = self.map_hg_get(sha)
305 ad2ea8d6ef94 update_remote_branches: refactor head usage Tay Ray Chuan <rctay89@gmail.com> parents: 304 diff changeset	1124 head = ref_name[11:]
367 699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1125 tags['/'.join((remote_name, head))] = hgsha
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1126 # TODO(durin42): what is this doing?
305 ad2ea8d6ef94 update_remote_branches: refactor head usage Tay Ray Chuan <rctay89@gmail.com> parents: 304 diff changeset	1127 new_ref = 'refs/remotes/%s/%s' % (remote_name, head)
ad2ea8d6ef94 update_remote_branches: refactor head usage Tay Ray Chuan <rctay89@gmail.com> parents: 304 diff changeset	1128 self.git.refs[new_ref] = sha
316 7e5ed21ceec1 git_handler: prefer () continuation to \ continuation. Augie Fackler <durin42@gmail.com> parents: 306 diff changeset	1129 elif (ref_name.startswith('refs/tags')
7e5ed21ceec1 git_handler: prefer () continuation to \ continuation. Augie Fackler <durin42@gmail.com> parents: 306 diff changeset	1130 and not ref_name.endswith('^{}')):
305 ad2ea8d6ef94 update_remote_branches: refactor head usage Tay Ray Chuan <rctay89@gmail.com> parents: 304 diff changeset	1131 self.git.refs[ref_name] = sha
196 40edc4b814e4 Reorganize push for more symmetry with fetch Abderrahim Kitouni <a.kitouni@gmail.com> parents: 195 diff changeset	1132
367 699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1133 tf = open(tagfile, 'wb')
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1134 for tag, node in tags.iteritems():
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1135 tf.write('%s %s\n' % (node, tag))
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1136 tf.close()
699088d9dd9f hgrepo: completely rework handing of remote refs marking Augie Fackler <durin42@gmail.com> parents: 361 diff changeset	1137
196 40edc4b814e4 Reorganize push for more symmetry with fetch Abderrahim Kitouni <a.kitouni@gmail.com> parents: 195 diff changeset	1138
183 469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	1139 ## UTILITY FUNCTIONS
469e80d3142a Reorder methods by their functionality. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 182 diff changeset	1140
53 5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	1141 def convert_git_int_mode(self, mode):
213 61471faeb7fd small cleanups (tabs, s/TODO :/TODO:/ and dead code) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 212 diff changeset	1142 # TODO: make these into constants
53 5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	1143 convert = {
121 0c94e860a0ed use octal numbers for modes. Dmitriy Taychenachev <dimichxp@gmail.com> parents: 120 diff changeset	1144 0100644: '',
0c94e860a0ed use octal numbers for modes. Dmitriy Taychenachev <dimichxp@gmail.com> parents: 120 diff changeset	1145 0100755: 'x',
0c94e860a0ed use octal numbers for modes. Dmitriy Taychenachev <dimichxp@gmail.com> parents: 120 diff changeset	1146 0120000: 'l'}
53 5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	1147 if mode in convert:
5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	1148 return convert[mode]
5deb5cbd86aa respecting file modes on git import Scott Chacon <schacon@gmail.com> parents: 52 diff changeset	1149 return ''
65 5ed8316d3cfa Start using reasonable ui.{status,debug,warn} calls instead of print. Augie Fackler <durin42@gmail.com> parents: 56 diff changeset	1150
71 19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	1151 def extract_hg_metadata(self, message):
227 c4f6e6f24bf1 fix bug introduced by previous commit Abderrahim Kitouni <a.kitouni@gmail.com> parents: 226 diff changeset	1152 split = message.split("\n--HG--\n", 1)
71 19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	1153 renames = {}
164 7e98757deadc author and extra data fixes Scott Chacon <schacon@gmail.com> parents: 162 diff changeset	1154 extra = {}
79 7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	1155 branch = False
71 19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	1156 if len(split) == 2:
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	1157 message, meta = split
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	1158 lines = meta.split("\n")
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	1159 for line in lines:
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	1160 if line == '':
181 8690377c3ce9 Various cleanups (mostly whitespace and imports) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 179 diff changeset	1161 continue
8690377c3ce9 Various cleanups (mostly whitespace and imports) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 179 diff changeset	1162
456 4ed0d8dac6e7 git_handler: add missing not from hg metadata extraction Augie Fackler <raf@durin42.com> parents: 452 diff changeset	1163 if ' : ' not in line:
452 797a3584c78f git_handler: fix line.split error when bad data from a rebase is in the log Sean Farley <sean@mcs.anl.gov> parents: 450 diff changeset	1164 break
71 19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	1165 command, data = line.split(" : ", 1)
181 8690377c3ce9 Various cleanups (mostly whitespace and imports) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 179 diff changeset	1166
71 19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	1167 if command == 'rename':
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	1168 before, after = data.split(" => ", 1)
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	1169 renames[after] = before
19053d11d520 explicit renames converting both ways now Scott Chacon <schacon@gmail.com> parents: 70 diff changeset	1170 if command == 'branch':
79 7b4cf18c896b readded yet another piece of code that disappeared at some point, recovering branches properly Scott Chacon <schacon@gmail.com> parents: 78 diff changeset	1171 branch = data
164 7e98757deadc author and extra data fixes Scott Chacon <schacon@gmail.com> parents: 162 diff changeset	1172 if command == 'extra':
7e98757deadc author and extra data fixes Scott Chacon <schacon@gmail.com> parents: 162 diff changeset	1173 before, after = data.split(" : ", 1)
7e98757deadc author and extra data fixes Scott Chacon <schacon@gmail.com> parents: 162 diff changeset	1174 extra[before] = urllib.unquote(after)
204 4734153365ac revert the changes made in 405a915bf352 and 8bfa8aa6b68f Abderrahim Kitouni <a.kitouni@gmail.com> parents: 203 diff changeset	1175 return (message, renames, branch, extra)
181 8690377c3ce9 Various cleanups (mostly whitespace and imports) Abderrahim Kitouni <a.kitouni@gmail.com> parents: 179 diff changeset	1176
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1177 def get_file(self, commit, f):
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1178 otree = self.git.tree(commit.tree)
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1179 parts = f.split('/')
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1180 for part in parts:
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1181 (mode, sha) = otree[part]
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1182 obj = self.git.get_object(sha)
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1183 if isinstance (obj, Blob):
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1184 return (mode, sha, obj._text)
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1185 elif isinstance(obj, Tree):
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1186 otree = obj
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1187
80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1188 def get_files_changed(self, commit):
275 c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1189 tree = commit.tree
c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1190 btree = None
c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1191
c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1192 if commit.parents:
c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1193 btree = self.git[commit.parents[0]].tree
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1194
275 c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1195 changes = self.git.object_store.tree_changes(btree, tree)
c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1196 files = {}
c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1197 for (oldfile, newfile), (oldmode, newmode), (oldsha, newsha) in changes:
287 e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1198 # don't create new submodules
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1199 if newmode == 0160000:
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1200 if oldfile:
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1201 # become a regular delete
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1202 newfile, newmode = None, None
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1203 else:
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1204 continue
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1205 # so old submodules shoudn't exist
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1206 if oldmode == 0160000:
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1207 if newfile:
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1208 # become a regular add
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1209 oldfile, oldmode = None, None
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1210 else:
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1211 continue
e08a22250fa9 Don't import git submodule files (we don't support them .. yet). jeremy avnet <brainsik@saucelabs.com> parents: 286 diff changeset	1212
275 c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1213 if newfile is None:
c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1214 file = oldfile
c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1215 delete = True
c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1216 else:
c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1217 file = newfile
c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1218 delete = False
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1219
275 c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1220 files[file] = (delete, newmode, newsha)
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1221
275 c2d6b1093e7e fix a bug when a directory is replaced with a file Abderrahim Kitouni <a.kitouni@gmail.com> parents: 261 diff changeset	1222 return files
224 80d67ae190df port to upstream dulwich Abderrahim Kitouni <a.kitouni@gmail.com> parents: 222 diff changeset	1223
476 b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1224 def collect_gitlinks(self, tree_id):
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1225 """Walk the tree and collect all gitlink entries
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1226 :param tree_id: sha of the commit tree
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1227 :return: list of tuples (commit sha, full entry path)
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1228 """
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1229 queue = [(tree_id, '')]
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1230 gitlinks = []
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1231 while queue:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1232 e, path = queue.pop(0)
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1233 o = self.git.object_store[e]
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1234 for (name, mode, sha) in o.iteritems():
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1235 if mode == S_IFGITLINK:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1236 gitlinks.append((posixpath.join(path, name), sha))
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1237 elif stat.S_ISDIR(mode):
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1238 queue.append((sha, posixpath.join(path, name)))
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1239 return gitlinks
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1240
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1241 def parse_gitmodules(self, tree_obj):
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1242 """Parse .gitmodules from a git tree specified by tree_obj
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1243
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1244 :return: list of tuples (submodule path, url, name),
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1245 where name is quoted part of the section's name, or
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1246 empty list if nothing found
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1247 """
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1248 rv = []
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1249 try:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1250 unused_mode,gitmodules_sha = tree_obj['.gitmodules']
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1251 except KeyError:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1252 return rv
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1253 gitmodules_content = self.git[gitmodules_sha].data
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1254 fo = StringIO.StringIO(gitmodules_content)
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1255 tt = dul_config.ConfigFile.from_file(fo)
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1256 for section in tt.keys():
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1257 section_kind, section_name = section
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1258 if section_kind == 'submodule':
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1259 sm_path = tt.get(section, 'path')
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1260 sm_url = tt.get(section, 'url')
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1261 rv.append((sm_path, sm_url, section_name))
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1262 return rv
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1263
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1264 def git_file_readlines(self, tree_obj, fname):
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1265 """Read content of a named entry from the git commit tree
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1266
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1267 :return: list of lines
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1268 """
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1269 if fname in tree_obj:
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1270 unused_mode, sha = tree_obj[fname]
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1271 content = self.git[sha].data
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1272 return content.splitlines()
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1273 return []
b9ede5f91701 Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 475 diff changeset	1274
184 7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1275 def remote_name(self, remote):
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1276 names = [name for name, path in self.paths if path == remote]
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1277 if names:
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1278 return names[0]
7bf98d3085f4 Fix remote branch hadling to use the hgrc [paths] section Abderrahim Kitouni <a.kitouni@gmail.com> parents: 183 diff changeset	1279
186 f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1280 # Stolen from hgsubversion
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1281 def swap_out_encoding(self, new_encoding='UTF-8'):
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1282 try:
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1283 from mercurial import encoding
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1284 old = encoding.encoding
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1285 encoding.encoding = new_encoding
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1286 except ImportError:
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1287 old = hgutil._encoding
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1288 hgutil._encoding = new_encoding
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1289 return old
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1290
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1291 def decode_guess(self, string, encoding):
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1292 # text is not valid utf-8, try to make sense of it
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1293 if encoding:
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1294 try:
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1295 return string.decode(encoding).encode('utf-8')
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1296 except UnicodeDecodeError:
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1297 pass
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1298
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1299 try:
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1300 return string.decode('latin-1').encode('utf-8')
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1301 except UnicodeDecodeError:
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1302 return string.decode('ascii', 'replace').encode('utf-8')
f4caf22b87cd Handle git repositories with legacy encodings. Abderrahim Kitouni <a.kitouni@gmail.com> parents: 184 diff changeset	1303
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	1304 def get_transport_and_path(self, uri):
369 e5c743cd0da1 pass hg's ui.ssh config to dulwich Tay Ray Chuan <rctay89@gmail.com> parents: 368 diff changeset	1305 # pass hg's ui.ssh config to dulwich
e5c743cd0da1 pass hg's ui.ssh config to dulwich Tay Ray Chuan <rctay89@gmail.com> parents: 368 diff changeset	1306 if not issubclass(client.get_ssh_vendor, _ssh.SSHVendor):
e5c743cd0da1 pass hg's ui.ssh config to dulwich Tay Ray Chuan <rctay89@gmail.com> parents: 368 diff changeset	1307 client.get_ssh_vendor = _ssh.generate_ssh_vendor(self.ui)
e5c743cd0da1 pass hg's ui.ssh config to dulwich Tay Ray Chuan <rctay89@gmail.com> parents: 368 diff changeset	1308
538 a38abdbab77c Precompile Git URI regular expression Gregory Szorc <gregory.szorc@gmail.com> parents: 537 diff changeset	1309 git_match = RE_GIT_URI.match(uri)
446 7e6fc0efc500 Removed support for URLs beginning with git@. These URLs are not possible from within mercurial. Jason R. Coombs <jaraco@jaraco.com> parents: 445 diff changeset	1310 if git_match:
7e6fc0efc500 Removed support for URLs beginning with git@. These URLs are not possible from within mercurial. Jason R. Coombs <jaraco@jaraco.com> parents: 445 diff changeset	1311 res = git_match.groupdict()
7e6fc0efc500 Removed support for URLs beginning with git@. These URLs are not possible from within mercurial. Jason R. Coombs <jaraco@jaraco.com> parents: 445 diff changeset	1312 transport = client.SSHGitClient if 'ssh' in res['scheme'] else client.TCPGitClient
7e6fc0efc500 Removed support for URLs beginning with git@. These URLs are not possible from within mercurial. Jason R. Coombs <jaraco@jaraco.com> parents: 445 diff changeset	1313 host, port, sepr, path = res['host'], res['port'], res['sepr'], res['path']
7e6fc0efc500 Removed support for URLs beginning with git@. These URLs are not possible from within mercurial. Jason R. Coombs <jaraco@jaraco.com> parents: 445 diff changeset	1314 if sepr == '/':
7e6fc0efc500 Removed support for URLs beginning with git@. These URLs are not possible from within mercurial. Jason R. Coombs <jaraco@jaraco.com> parents: 445 diff changeset	1315 path = '/' + path
447 1189e52ba27c Strip trailing slash for heroku-style URLs. Fixes #31. Includes a regression test for the fix. Jason R. Coombs <jaraco@jaraco.com> parents: 446 diff changeset	1316 # strip trailing slash for heroku-style URLs
1189e52ba27c Strip trailing slash for heroku-style URLs. Fixes #31. Includes a regression test for the fix. Jason R. Coombs <jaraco@jaraco.com> parents: 446 diff changeset	1317 # ssh+git://git@heroku.com:project.git/
1189e52ba27c Strip trailing slash for heroku-style URLs. Fixes #31. Includes a regression test for the fix. Jason R. Coombs <jaraco@jaraco.com> parents: 446 diff changeset	1318 if sepr == ':' and path.endswith('.git/'):
1189e52ba27c Strip trailing slash for heroku-style URLs. Fixes #31. Includes a regression test for the fix. Jason R. Coombs <jaraco@jaraco.com> parents: 446 diff changeset	1319 path = path.rstrip('/')
446 7e6fc0efc500 Removed support for URLs beginning with git@. These URLs are not possible from within mercurial. Jason R. Coombs <jaraco@jaraco.com> parents: 445 diff changeset	1320 if port:
7e6fc0efc500 Removed support for URLs beginning with git@. These URLs are not possible from within mercurial. Jason R. Coombs <jaraco@jaraco.com> parents: 445 diff changeset	1321 client.port = port
261 29e5072ddaab Handle normal relative SSH paths (i.e for heroku and gitosis) as well as github style paths. Lincoln Stoll <lstoll@lstoll.net> parents: 260 diff changeset	1322
446 7e6fc0efc500 Removed support for URLs beginning with git@. These URLs are not possible from within mercurial. Jason R. Coombs <jaraco@jaraco.com> parents: 445 diff changeset	1323 return transport(host, thin_packs=False, port=port), path
439 3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	1324
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	1325 httpclient = getattr(client, 'HttpGitClient', None)
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	1326
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	1327 if uri.startswith('git+http://') or uri.startswith('git+https://'):
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	1328 uri = uri[4:]
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	1329
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	1330 if uri.startswith('http://') or uri.startswith('https://'):
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	1331 if not httpclient:
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	1332 raise RepoError('git via HTTP requires dulwich 0.8.1 or later')
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	1333 else:
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	1334 return client.HttpGitClient(uri, thin_packs=False), uri
3f45c88100e8 add support for the HTTP smart protocol when using Dulwich tip Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 432 diff changeset	1335
5 d6c443a91b18 refactored the git handling stuff out into another class Scott Chacon <schacon@gmail.com> parents: diff changeset	1336 # if its not git or git+ssh, try a local url..
286 0661d5721ad7 git_handler: use progress API instead of reinventing the wheel Augie Fackler <durin42@gmail.com> parents: 285 diff changeset	1337 return client.SubprocessGitClient(thin_packs=False), uri

Mercurial > hg > hg-git

annotate hggit/git_handler.py @ 541:df1598b722e8