Sean Farley
b8476fff7c
git_handler: fix line.split error when bad data from a rebase is in the log
2012-03-31 13:55:06 -05:00
Mike Bayer
f764a03014
- add "author file" extension, allows an author translation map
...
to put more legit author names in the outgoing git repo
2012-02-23 13:49:07 -05:00
Mike Bayer
6ca9e6dcd1
Add documentation for branch_bookmark_suffix configuration parameter
2012-02-25 16:13:02 -05:00
Keshav Kini
89e9168ff4
Remove illegal characters from username/email
...
Includes a doctest and tests in test-hg/author for the correct behavior.
2012-02-15 09:30:06 +08:00
Jason R. Coombs
c927a00fe4
Strip trailing slash for heroku-style URLs. Fixes #31 . Includes a regression test for the fix.
2012-01-27 22:48:55 -05:00
Jason R. Coombs
9eee4f19dc
Removed support for URLs beginning with git@. These URLs are not possible from within mercurial.
2012-01-27 13:24:31 -05:00
Jason R. Coombs
dce42e28df
Simplified URL handling with a single regular expression. This change enables port declarations with colon-separated urls.
2012-01-26 22:20:31 -05:00
Augie Fackler
11ea28f917
Bump version number for release.
2012-01-27 11:52:42 -06:00
Augie Fackler
2d280d3dfb
Update for newer dulwich and hg versions.
2012-01-27 11:06:27 -06:00
Mike Bayer
05e4d83f4b
- add "branch_bookmark_names" parameter. this allows bookmarks
...
that mimic a branchname to be maintained on the git side without
a particular suffix - e.g. if the hg repo had a branch "release_05",
and a bookmark created onto it "release_05_bookmark", the branch on the
git side would be named "release_05". When pulling branches back from
git, if an hg named branch of that name exists, the suffix is appended
back onto the name before creating a bookmark on the hg side.
This is strictly so that a git repo can be generated that has the
same "branch names" as an older hg repo that has named branches, and
has had bookmarks added in to mirror the branch names.
This is given the restrictions that
A. hg named branches can never be renamed and B. hg-git only supports
hg bookmarks, not branches
2011-12-18 18:54:16 -05:00
Arne Babenhauserheide
cff1b0b0d8
removed outdated info that hg can’t transfer bookmarks.
2011-11-11 16:25:56 +01:00
Dan Villiom Podlaski Christiansen
78c2d2b9f4
add support for the HTTP smart protocol when using Dulwich tip
...
I have tested this with unauthenticated pulls from
Bitbucket. Authentication appears broken; I suspect this is a
limitation in Dulwich.
2011-10-05 22:44:29 +02:00
Tay Ray Chuan
29bac75cc1
tests: accomodate changes in git-merge output
...
Since git v1.7.7, merge outputs its status in the form
Merge made by the * strategy.
Use a regex substitution, so that older versions are handled
successfully as well.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
2011-10-09 13:39:37 -05:00
Augie Fackler
e249c92f76
setup.py: bump version to 0.3.1 for bugfix release
2011-09-13 18:16:00 -05:00
Augie Fackler
fd43cd5b7c
setup.py: correct dependency to 0.8.0
...
I incorrectly specified 0.8.1, which is the *next* release of dulwich,
not 0.8.0, which works just fine.
2011-09-13 18:15:03 -05:00
Augie Fackler
fb2d55d2a9
Bump version for release.
2011-09-09 16:17:28 -05:00
Ehsan Akhgari
d57f385799
Improve the parsing of author lines from Mercurial to generate committer and author lines that git can correctly understand
...
Signed-off-by: Ehsan Akhgari <ehsan.akhgari@gmail.com>
---
I found a number of bugs when I was trying to convert Mozila's hg repository
to git using hg-git. This patch fixes a number of bugs with irregular
author lines present in hg repositories. Git cannot correctly process a
commit object which has a committer or author line in a format that it does
not understand, which makes it not be able to handle the repositories
with have such commit objects.
The added test cases shows the irregular cases that this patch is able to
deal with.
2011-09-09 16:12:49 -05:00
Augie Fackler
c018b52ea8
Makefile: include 1.9.2 in all-version-tests
2011-09-09 16:08:58 -05:00
Augie Fackler
7659e2b8a6
outgoing: abort on broken hg versions rather than printing wrong results
2011-09-09 16:08:31 -05:00
Augie Fackler
2a4f0d3a5b
Adapt to atomictempfile API changes from Mercurial.
2011-09-09 16:00:52 -05:00
Augie Fackler
5286104b4d
test-incoming: test updates for progress capturing
2011-09-09 15:49:31 -05:00
Augie Fackler
396fa1faa9
setup: require dulwich 0.8.1
2011-09-09 13:34:40 -05:00
Augie Fackler
9b926199fe
Merge test fixes for dulwich changes and output changes.
2011-09-09 15:44:25 -05:00
Augie Fackler
b8794ce003
Merge incoming fix.
2011-09-09 15:43:35 -05:00
Augie Fackler
9e574c9364
getremotechanges: fix incoming support
...
'hg incoming' causes getremotechanges to be called with revs as a
positional argument, which we were not correctly catching here.
2011-09-09 15:42:24 -05:00
Augie Fackler
bad8d98927
overlay: stop using deprecated tree.entries() method
2011-09-09 13:44:58 -05:00
Augie Fackler
43c3024db6
Fix all-version-tests.
2011-07-19 08:11:02 -05:00
Augie Fackler
b54f430c7a
Merge fix for hg out failing on empty repo.
2011-07-17 14:01:40 -05:00
Scott Chacon
83390977cd
only want heads and tags
2011-07-15 15:33:48 -07:00
mcc
fa9b6433a8
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.
2011-07-13 22:15:04 -07:00
Augie Fackler
0e48fa29cb
test-url-parsing: update expecations missed by 70247167a4b5
2011-07-13 08:06:52 -05:00
Junichi OKADOME
41fa77794d
to be recognized port number in path to repository
2011-07-13 17:51:16 +09:00
Brendan Cully
d499a8fc67
Unbreak outgoing to non-git repos with hg pre-1.9
...
The wrapped version of findoutgoing unconditionally mangled the
keyword arguments, but doesn't do version fixups unless the
remote is a git repository. This change only mangles the argument
list when the remote is a git repository.
2011-06-23 11:29:30 -07:00
Augie Fackler
fbaa1cbcfb
Test output format tweaks for test-outgoing.
2011-06-19 10:34:10 -05:00
Augie Fackler
5344bfdeb2
test-incoming: fixes for hg 1.7
2011-06-17 16:20:08 -05:00
Augie Fackler
890facca02
test fixes for progress cleanup
2011-06-17 15:01:31 -05:00
Brendan Cully
d387fe4170
Fix mercurial issue2855
...
I accidentally broke transplant by making revs a required argument.
2011-06-17 09:23:52 -07:00
Brendan Cully
851456bac4
Convert dulwich progress into mercurial ui.progress
...
Breaks most tests cosmetically, but for the better.
2011-06-15 23:40:12 -07:00
Augie Fackler
98050ffe8b
test-incoming: only run on hg 1.7.x and newer
2011-05-31 19:36:53 -05:00
Brendan Cully
b7ea69294f
Prevent exception in incoming with hg <= 1.6
...
With this patch, incoming against a git repo returns "no changes found"
with hg <= 1.6.
2011-05-31 10:46:52 -07:00
Brendan Cully
95c74ae913
Support for hg incoming
2011-05-24 11:16:45 -07:00
Augie Fackler
6884457b1f
test-conflict-{1,2}: cope with minor hg output variations
2011-05-25 09:25:34 -05:00
Christian Walther
535c79d7b1
Fix round-trip fidelity for merges of converged files.
2011-05-24 20:07:37 +02:00
Christian Walther
0ce3373b35
New tests for round-trip fidelity of merge conflicts resolved using one parent.
...
First one currently fails.
2011-05-24 20:07:37 +02:00
Christian Walther
da1c5f2996
New test for round-trip fidelity of a merge of converged files.
...
Currently fails.
2011-05-24 20:07:37 +02:00
Augie Fackler
b0b767dbbe
Merge.
2011-05-23 19:32:26 -05:00
César Izurieta
58c48d9319
Use author as email when it is an email
2011-05-23 19:29:33 -03:00
Brendan Cully
59f1915416
Define gitrepo.islocal
...
This makes hg clone src dst create the correct default path when
src is a local path.
2011-05-23 10:32:38 -07:00
Adrian Sampson
4fa25100ed
respect references to tags that differ between git and .hgtags
2011-05-20 22:41:43 -07:00
Adrian Sampson
8c05238aa7
use new names for tags cache attributes if they're available
2011-05-20 22:36:06 -07:00
