timeless
e0e5ff5a22
progress: use gerund form for import
2011-02-22 14:58:35 +01:00
Alexey Sokolov
f07d1aba51
Fix "hg outgoing" for mercurial versions which look like 1.6.x
...
Previous commit (hg-c1876c8a2531) assumed that there's nothing between
1.6 and 1.7
But 1.6.3 is more than 1.6, while still less than 1.7
2011-02-15 13:35:03 +06:00
jsumners
162fcb35fb
I found that inspect.getargspec(discovery.findoutgoing)[0] was returning [] instead of the expected function definition.
...
Since the change occurred between Mercurial 1.6 and 1.7, a simple version check works instead.
This fixes https://github.com/schacon/hg-git/issues/issue/168
2011-02-09 10:21:36 -05:00
Mads Kiilerich
f05e529556
Create ssh subprocess with a shell command instead of an exec list
...
This allows ui.ssh to be configured with a command line fragment instead of
just the name of an executable.
2010-12-25 23:49:16 +01:00
Augie Fackler
3cc0a94981
tests: also test against hg 1.7.2
2010-12-22 20:20:15 -06:00
Tay Ray Chuan
b96ab4cee9
pass hg's ui.ssh config to dulwich
...
This allows Windows users to override dulwich's default (the unix-y
ssh).
2010-12-22 16:57:26 -06:00
Augie Fackler
83cbd0b18e
Fix bug where remote ref map wrote out binary nodes.
2010-12-20 23:30:16 -06:00
Augie Fackler
6e81a1af77
hgrepo: completely rework handing of remote refs marking
...
Previously, we appended to .hg/localtags on every pull. This meant
that we never deleted refs that disappeared on the remote server, and
the file length grew without bound. Now we use our own file
(.hg/git-remote-refs) and we do prune refs that disappear from the
remote server.
2010-12-20 22:37:07 -06:00
Augie Fackler
1b5193949d
test-git-workflow: mark git repo as not bare so we can do commits
2010-11-16 08:34:26 -06:00
Augie Fackler
a5662069b9
setup: bump version to 0.2.5
2010-11-02 08:37:41 -05:00
Augie Fackler
8268cc74ed
Makefile: add .PHONY so tests will run correctly
2010-10-29 08:36:29 -05:00
Augie Fackler
006aedf259
demandimport: defend against collections breakage in new dulwich
2010-10-29 08:31:42 -05:00
Mike Blume
b4ec782ca1
fix typo -- my bad >.<
2010-10-24 14:19:39 -07:00
Mike Blume
266b9b4429
Looks like the latest version of Dulwich returns a tuple here. Let's handle that
2010-10-24 14:00:32 -07:00
Augie Fackler
de4ddb6d89
setup: bump version number
2010-08-25 15:45:46 -05:00
Dan Villiom Podlaski Christiansen
3c85b4f11a
Makefile: *BSD support.
2010-08-25 22:38:30 +02:00
Augie Fackler
9f10d7eb3e
Merge version fixes with new tests that identify the breakage.
2010-08-15 09:46:00 -05:00
Augie Fackler
c13e8ed89d
tests: import test-push-r (with slight changes) from Mercurial
...
This lets us detect defects in our wrappers which would break
Mercurial when working against normal hg repositories with hg-git
enabled.
2010-08-15 09:45:00 -05:00
Augie Fackler
58357619af
Makefile: add target for testing against many hg versions at once
2010-08-15 09:41:28 -05:00
Augie Fackler
fe874e7b7f
findoutgoing: update wrapper for hg change d844bc669660
2010-07-30 17:24:28 -05:00
Augie Fackler
c452d54ea2
test-git-submodules: update for git output format change
2010-07-30 16:12:13 -05:00
Dan Villiom Podlaski Christiansen
332ae4f274
hgrepo: fix compatibility with Mercurial 1.5
2010-07-20 16:20:41 +02:00
Augie Fackler
88aca45a94
findoutgoing: more flexible wrapper function that should be more portable
2010-08-14 21:34:34 -05:00
Augie Fackler
139afc6667
Bump version to 0.2.3
2010-07-05 11:56:04 -05:00
Augie Fackler
e2638245c2
gitrepo: update for pushable bookmarks
2010-07-05 11:54:06 -05:00
Augie Fackler
212cef6c15
test-url-parsing: defend against changes in dulwich
2010-07-05 11:47:34 -05:00
Augie Fackler
d421c65e08
hgrepo: pass through newbranch arg if pushing to hg
2010-06-18 08:20:47 -05:00
Augie Fackler
bbfe593b68
Add just enough code to handle changes to cset discovery.
2010-06-12 21:49:14 -05:00
Augie Fackler
1e60838d6e
test-pull-after-strip: discared new backup message from strip
2010-06-12 21:48:41 -05:00
Augie Fackler
cf1d45e35b
README: remove defunct Author list, use {hg,git} log to find out.
2010-06-12 21:28:09 -05:00
Augie Fackler
2fe1e8e4cd
README: 80 columns cleanup.
2010-06-12 21:27:17 -05:00
Augie Fackler
d772c0bb7d
README: remove outdated status, update version requirements.
2010-06-12 21:26:19 -05:00
Augie Fackler
9307310b66
Merge README cleanups.
2010-06-12 21:24:52 -05:00
Augie Fackler
185de4bf07
Merge documentation of in-tree and cleanup of the variable.
2010-06-12 21:23:01 -05:00
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
Augie Fackler
79f8792213
Bump version 0.2.2
2010-05-22 22:12:11 -05:00
Augie Fackler
04acdf24bd
Require dulwich 0.6.0
2010-05-22 22:10:17 -05:00
Benoit Allard
a808ff61ec
Fix a traceback when accessing _get_object() on Tag
2010-05-20 00:16:59 +02:00
Tay Ray Chuan
0f4cd1ffa0
README: add 'Commands' section and stubs
2010-05-17 23:00:56 +08:00
Tay Ray Chuan
b881f257a8
README: rename 'Commands' section to 'Usage'
2010-05-17 22:53:18 +08:00
Tay Ray Chuan
5fb45334d6
README: make url conversion more explicit
...
Previously, we just threw two clone commands (one for git and one for
hg) at the reader.
2010-05-17 22:34:23 +08:00
Tay Ray Chuan
8fd67ffa1a
README: say 'an explicit protocol prefix'
2010-05-17 22:27:46 +08:00
Tay Ray Chuan
b8d3b6e0b3
README: reword clone command section
...
Remove the duplicated "hg clone ..." command, favouring the block
instance over the inline one to emphasize focus on the command.
Also say "hg-git would clone..." instead of "it would clone..." to
minimize disambiguity.
While we're at it, wrap the lines to 80 characters.
2010-05-17 22:21:12 +08:00
Tay Ray Chuan
ad9c6e444c
README: document git.intree
...
In 9fa5e81 (Allow storing the git directory intree), hg-git learnt a new
configuration option, but this wasn't documented. Address this.
2010-05-17 20:37:26 +08:00
Tay Ray Chuan
4b2fb41612
explicitly expect boolean values for git.intree
2010-05-17 20:04:02 +08:00
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
