Tay Ray Chuan
b5ea870e9b
README: prefix commands with dollar sign
2010-05-17 19:50:58 +08:00
Tay Ray Chuan
be855526a9
README: use bare-minimum of 4 spaces for code blocks
...
Currently, we're using 8 spaces. Although this isn't invalid Markdown
syntax, this causes the readme to rendered on github with additional and
unnecessary indentation.
2010-05-17 19:49:49 +08:00
Augie Fackler
c9fb39537b
Un-break hg 1.3 by adding a compat layer for progress.
2010-04-30 10:35:13 -05:00
Simon Ruderich
d9d8904cc8
README.md: Improve Mercurial to Git conversion description.
2010-04-06 10:20:13 -05:00
Simon Ruderich
5901de8797
README.md: Add information to convert Mercurial to Git.
2010-04-06 10:19:30 -05:00
Augie Fackler
a6ef0b0441
Merge style fix
2010-04-05 19:06:48 -05:00
Augie Fackler
5919da5815
git_handler: prefer () continuation to \ continuation.
2010-04-05 19:06:20 -05:00
Augie Fackler
ba071dd972
setup.py: depend on dulwich 0.5.1 or later
2010-04-05 19:05:18 -05:00
Augie Fackler
07ad6a34c9
Merge test fix.
2010-04-05 18:52:58 -05:00
Tay Ray Chuan
e283322a66
test-pull-after-strip: don't run git-cleanup twice
2010-04-05 13:28:52 +08:00
Tay Ray Chuan
fff9a81fa3
Merge branch 'rc/push-tag' into rc/master
2010-04-04 23:26:46 +08:00
Tay Ray Chuan
58dec6d0a4
when pushing, check if server is advertising annotated tags
...
Check if already we have these annotated tags; if so, don't push it.
Update test-git-tags too.
2010-04-04 23:16:00 +08:00
Tay Ray Chuan
0fa6f2e0fe
test-git-tags: test pushing to repo with annotated tags
...
Currently, this fails with a 'tag has changed' message.
Additionally, set the receive.denyCurrentBranch config, as we're pushing
a branch to a git repo which has checked out that branch. Also, this is
to handle git after v1.7.0, where that config defaults to "refuse".
2010-04-04 23:10:10 +08:00
Tay Ray Chuan
e09d350f36
Merge branch 'rc/fix-ann-tags' into rc/master
2010-04-04 19:23:34 +08:00
Tay Ray Chuan
8bce9096c1
update references to Tag.get_object()
...
dulwich recently renamed [1] the Tag.get_object() method to
_get_object(). Update our usage correspondingly.
[1] git reference: f85ce56 (Support determining blob id without joining
all chunks first.)
2010-04-02 20:08:14 +08:00
Tay Ray Chuan
5fae58d6aa
handle apply_delta() return value correctly
...
dulwich recently changed apply_delta() [1] to return lists. Invoke
join() on the output with an empty string, as dulwich does in its
codebase.
[1] git reference: a2709f6 (Return chunks from apply_delta.)
2010-04-02 19:56:50 +08:00
Tay Ray Chuan
dbadcb184b
update_remote_branches: don't store de-refed tags
...
If a git tag is of the annotated-type, the git server sends an
additional line with the SHA-1 the tag dereferences to (eg.
refs/tag/mytag^{}). These aren't "real" tags, so don't store them.
2010-03-29 13:19:52 +08:00
Tay Ray Chuan
336ec5a893
update_remote_branches: refactor head usage
...
Splice the ref name only once, and don't loop through refs/heads
multiple times.
This changes the order in which hg tags are created; update test output
to reflect this.
2010-03-29 13:19:00 +08:00
Tay Ray Chuan
41495ccdb6
update_remote_branches: don't prepend '/' to heads
...
We were saving tracking branches to 'refs/remotes/<remote>//<ref>'
(double slash).
2010-03-29 13:00:49 +08:00
Tay Ray Chuan
1a2811a633
tests: specify --pretty format
...
If the user sets git config --global format.pretty, all hell breaks
loose. Specifying it prevents this.
2010-03-28 12:21:48 +08:00
Augie Fackler
a18abe29e6
Merge debug message fix.
2010-03-27 22:20:18 -05:00
Augie Fackler
d1961293e0
Various hg 1.4 compat fixes.
2010-03-27 21:37:58 -05:00
Augie Fackler
85fe0468ec
test-hg-branch: sed hashes from hg < 1.5
2010-03-27 21:16:41 -05:00
Augie Fackler
4e59f313a6
pull: make it possible to un-wedge the repo after stripping git revs
...
This adds a new command, which is inelegant, but it lets you safely
pick up pulling fairly quickly.
2010-03-25 20:24:00 -05:00
Augie Fackler
65560ee872
hggit: defend against exceptions when pulling with -r
2010-03-25 20:23:00 -05:00
Augie Fackler
c3fa923231
hggit: don't wrap gitrepo with hgrepo
2010-03-25 20:23:00 -05:00
Augie Fackler
5f31688932
tests: many, many changes so we never push into a checked-out ref
2010-03-25 19:54:00 -05:00
Augie Fackler
bf0efb8a3e
git_handler: 80 columns cleanup
2010-03-25 19:39:00 -05:00
Augie Fackler
c5bfabbe71
git_handler: fix % formatting in ref errors.
2010-03-25 19:37:00 -05:00
Tay Ray Chuan
23362335d5
export_hg_commit: fix debug note
...
We were outputting the raw SHA-1.
2010-03-22 12:25:33 +08:00
Augie Fackler
fdd03567a1
tests: missed some hash changes last time around
2010-03-03 19:25:29 -06:00
Augie Fackler
7e9ef6943c
tests: fix for new sorting of extra in hg and new topological sort
2010-03-03 17:47:00 -06:00
Augie Fackler
3e1ab2fc85
test-git-workflow: work around git output format change
2010-03-03 17:43:01 -06:00
Abderrahim Kitouni
2c65097235
fix gimport and add test for using to work on hg repos from git (issue 73)
2010-02-26 19:27:32 +01:00
jeremy avnet
c6ea6998e8
Don't import git submodule files (we don't support them .. yet).
2010-02-23 16:23:09 -05:00
Augie Fackler
fc62064c74
git_handler: use progress API instead of reinventing the wheel
2010-02-24 21:08:38 -06:00
Augie Fackler
42a1ea9ecf
git_handler: slight style cleanup
2010-02-24 21:08:19 -06:00
Benoit Boissinot
dff5d44529
sort heads by commit date in topological sort
2010-02-24 17:21:25 +01:00
Benoit Boissinot
ec3fad56d9
use a simple toposort algorithm for DAG (post order from a DFS from the heads)
2010-02-24 17:21:23 +01:00
Benoit Boissinot
b1861d6f6d
make sure no tag object are included in the DAG we build
2010-02-24 17:21:20 +01:00
Augie Fackler
ca2a34eaec
init: strip .git for default clone destination for git sources
2010-01-11 20:48:43 -06:00
Augie Fackler
b2653f208f
init: whitespace cleanup
2010-01-11 20:46:52 -06:00
Augie Fackler
d7e9a9014c
setup: bump to 0.2.1
2009-12-26 13:46:37 -06:00
Augie Fackler
197936d8b3
tests: update some test expectations
2009-12-26 13:41:56 -06:00
Augie Fackler
48f2a58b23
Merge with abderrahim.
2009-12-26 13:31:24 -06:00
Augie Fackler
9bab70cf53
setup: bump to 0.2.0
2009-12-26 12:42:25 -06:00
Augie Fackler
504dd7f416
git_handler: update for slight API change in bookmarks
...
This should continue being backwards compatible through at least hg 1.3, perhaps further.
2009-12-26 12:22:06 -06:00
Abderrahim Kitouni
91561c5a2e
fix a bug when a directory is replaced with a file
...
also use ObjectStore.tree_changes from dulwich instead of our own func
(the change to test octopus is legitimate, there were some duplicate
entries)
2009-12-25 08:56:20 +01:00
Antonin Amand
e4c754e5b8
remove unused imports
2009-11-29 16:29:18 +01:00
Antonin Amand
f57a02a4cc
python 2.4 syntax fix
2009-11-29 16:24:34 +01:00