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
Brendan Cully
1182e4bbb6
pull: more conservative count of new heads
...
Testing against the k-9 repository I realized I am counting too many
references as changed after a pull.
2011-05-20 09:47:50 -07:00
Brendan Cully
a36df4d3a1
Make pull results more like hg pulls.
...
Returns the number of changed heads (refs).
Uses the same "no changes found" message.
2011-05-18 15:12:32 -07:00
Augie Fackler
838af18b9f
test-pull-after-strip: Update expectations since we are not refetching objects
2011-05-18 08:14:02 -05:00
Brendan Cully
001a4d567d
Only fetch objects that are not already present.
...
fetch_pack was needlessly walking every ref even when the refs were already
known locally.
2011-05-18 00:31:40 -07:00
Brendan Cully
00fdcfbbc3
Catch GitProtocolError wherever HangupException can occur.
...
With recent changes to dulwich, this exception occurs in more places.
2011-05-18 00:31:40 -07:00
Augie Fackler
bd7b30f743
tests: update expectations after message cleanups
2011-05-18 08:10:00 -05:00
Brendan Cully
e6be1640a8
Message cleanups
...
Only show importing/exporting messages when there is something
to do. Change "importing Hg objects into Git" to "exporting
hg objects to git" (and lowercase the other direction).
2011-05-18 00:31:36 -07:00
Brendan Cully
b7699cab00
Improve error reporting in get_refs
...
With this patch, attempts to push (or run outgoing) to read-only git URLs
at github return github's helpful error message instead of just saying
the remote end hung up.
2011-05-17 16:26:13 -07:00
Augie Fackler
479bebaa1f
tests: cope with output format changes in hg 1.8
...
These test changes should make it easier to see what's still broken in
1.8 and 1.9. Ideally, we'll drop pre-1.8 versions soon and rip most of
this out, but I'm not sure how realistic that is in the short term.
2011-05-15 17:04:05 -05:00
Augie Fackler
74b9553cd5
Cope with new discovery code without crashing.
2011-05-15 12:26:24 -05:00
Augie Fackler
e7abdc3a9a
url wasn't ever published as url.url, and is now util.url
2011-05-15 12:26:03 -05:00
Augie Fackler
b2953e0941
git_handler: support versions of hg without bookmarks
2011-05-15 12:24:25 -05:00
Augie Fackler
12ed874aa4
tests: use run-tests.py's built-in daemon killing
...
Makes interrupting a test run more graceful and overall less
frustrating.
2011-05-15 12:23:53 -05:00
Adrian Sampson
ea2c812385
fix for "outgoing" (previously, always printed all revisions)
2011-05-10 21:39:17 -07:00
Adrian Sampson
e833363641
activate a tipmost bookmark (git branch) after clone
2011-05-10 21:13:18 -07:00
