Tay Ray Chuan
75b937c19c
enforce stricter matching for pull -r
...
Use an exact match with the ref name ('foo' in 'refs/heads/foo'),
instead of just checking if it ended with '/foo'.
This allows
$ hg pull -r foo
to run successfully on a repo containing the branches
- 'foo',
- 'mine/foo',
- 'theirs/foo'
2010-06-02 20:14:26 +08:00
Augie Fackler
28545e94bc
Merge fix from Benoit Allard
2010-06-12 21:19:40 -05:00
Augie Fackler
5518aa1a5a
Cope with tags being sorted (hg cset 0376c4f17df5) by backporting that behavior
2010-06-12 21:14:33 -05:00
Augie Fackler
b6ff51f6c0
push: handle argspec change from a00aac92bfb9
2010-06-12 21:12:21 -05:00
Benoit Allard
a808ff61ec
Fix a traceback when accessing _get_object() on Tag
2010-05-20 00:16:59 +02:00
Augie Fackler
c9fb39537b
Un-break hg 1.3 by adding a compat layer for progress.
2010-04-30 10:35:13 -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
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
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
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
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
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
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
48f2a58b23
Merge with abderrahim.
2009-12-26 13:31:24 -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
Lincoln Stoll
86d0cc6948
Enable detection of bare repositories as a local git repo
2009-10-26 17:52:32 +01:00
Lincoln Stoll
d255491879
Handle normal relative SSH paths (i.e for heroku and gitosis) as well as github style paths.
2009-10-19 17:48:07 +02:00
Augie Fackler
fbdfb75d81
Merge with abderrahim.
2009-10-25 10:55:12 -05:00
Kevin Bullock
25a2b1d0a1
package with distutils
...
(patch tweaked slightly by Augie Fackler)
2009-09-30 14:39:49 -05:00
