Commit Graph

960 Commits

Author SHA1 Message Date
Dmitrij D. Czarkoff
19936ed1b6 test-renames.t: don't use "seq"
Seq is not a standard utility, and explicit loop should be more performant.
2016-01-14 13:33:35 +01:00
Sean Farley
401a99e1cf push: better formatting of messages from the server 2016-01-11 16:28:28 -08:00
Sean Farley
868bf2a374 git_handler: use util method for writing bookmarks 2016-01-08 13:59:39 -08:00
Sean Farley
4ecdfcbaeb util: add method for writing bookmarks 2016-01-08 13:58:47 -08:00
Sean Farley
0927a0ce0f util: regularize mercurial imports 2016-01-08 13:57:03 -08:00
Sean Farley
175b24b557 ignore: add .testtimes to ignored files 2016-01-08 11:30:06 -08:00
Siddharth Agarwal
1636e9e169 version: bump up to 0.8.4 2016-01-02 03:39:18 -08:00
Siddharth Agarwal
25f68d3e38 all-version-tests: test Mercurial 3.6.3 2016-01-02 03:35:55 -08:00
Augie Fackler
2ee07e0b3b git_handler: work around dulwich using unicode for ref names
Dulwich treats ref names internally as unicode strings (probably
because of Python 3?), which means that at some points it tries to do
os.path.join between the repo path and the unicode of the ref name,
which fails miserably if we construct the repo with a str and not a
unicode. Kludge around this problem.

Fixes issue 172.

This is a roll-forward of 3df4d529a2f2, which should be valid now that
the previous change defends against accidentally writing unicode tags
inside the templater.
2015-12-31 18:49:17 -05:00
Augie Fackler
1695f5ea63 hgrepo: ensure all git-origin tags are bytes
If we don't do this we might end up with unicodes being written using
ui, which then breaks in popbuffer in test-encoding.t. This appears to
be an academic concern until we start passing unicode paths to git
repos, which we need to do in order to resolve some other problems. Yay.
2015-12-31 18:48:01 -05:00
Augie Fackler
1c80236266 all-version-tests: wrap to 80 columns and test 3.{5,6}.2 2015-12-07 19:59:17 -05:00
Augie Fackler
ad192a02a6 Makefile: respect HGTESTFLAGS environment variable 2015-12-07 19:58:53 -05:00
Siddharth Agarwal
097c3b3e37 test-push.t: clean up compat cruft 2015-12-31 13:07:49 -08:00
Siddharth Agarwal
d597ed7943 testutil: clean up compat cruft 2015-12-31 13:02:34 -08:00
Siddharth Agarwal
11cf15b0dd test-subrepos.t: clean up compat cruft 2015-12-31 13:01:03 -08:00
Siddharth Agarwal
5b3067b1ca gitdirstate: fix up compat comment
pathutil isn't in 2.8.
2015-12-31 12:56:12 -08:00
Siddharth Agarwal
0b8ebc4c37 gitrepo: clean up compat cruft 2015-12-31 12:54:33 -08:00
Siddharth Agarwal
6b44a596c9 merge 2015-12-31 12:45:30 -08:00
Siddharth Agarwal
4da8faa79d overlay: regularize mercurial imports 2015-12-31 12:37:40 -08:00
Siddharth Agarwal
88776b1c4d gitdirstate: regularize mercurial imports 2015-12-31 12:36:16 -08:00
Siddharth Agarwal
bc415ebbf6 ssh: regularize mercurial imports 2015-12-31 12:34:29 -08:00
Siddharth Agarwal
6e5e1a63de hgrepo: regularize mercurial imports 2015-12-31 12:33:17 -08:00
Siddharth Agarwal
cbe9637432 hg2git: regularize mercurial imports 2015-12-31 12:27:07 -08:00
Siddharth Agarwal
4db39a76a0 init: regularize mercurial imports 2015-12-31 12:26:34 -08:00
Siddharth Agarwal
bd7830175b git_handler: regularize mercurial imports 2015-12-31 12:25:00 -08:00
Laurent Charignon
4ea775d1ba bookmarks: use bookmarks.recordchange instead of bookmarks.write if available
bookmarks.write is deprecated and it was showing warning messages in
test-hg-branch.t with the latest test runner from core mercurial. Tested with
both hg 2.8 and hg tip.
2015-12-30 10:27:24 -08:00
timeless@gmail.com
14a00dff5c init: handle AttributeError in addition to ImportError
If a module doesn't exist, it yields an ImportError,
if an attribtue doesn't exist on a module, it yields an AttributeError
2015-12-29 18:06:14 +00:00
Sean Farley
23cf0f33f3 ssh: fix breakage again with dulwich update
dulwich 0.12.x changed the way they pass parameters around, so we reformat that
to what hg-git expects.

This is just plain ridiculous.
2015-12-14 14:38:42 -08:00
Sean Farley
37c52e3cab push: print messages from the server
Some servers, for example, Bitbucket, output helpful messages. This patch
reports the output, if any exist, to the user.
2015-12-02 17:26:20 -08:00
Sean Farley
fc82883494 init: only activate git ignore logic in reposetup
This will massively speed up 'hg status' on repos that are not git based. On my
macports repo, status went from

Before: 0m0.591s
After:  0m0.297s
2015-10-29 15:57:17 -07:00
Siddharth Agarwal
cfe9c6dc8a Backed out changeset 3df4d529a2f2
This was causing test-encoding.t to fail.
2015-12-01 10:19:50 -08:00
Augie Fackler
28aa302374 git_handler: work around dulwich using unicode for ref names
Dulwich treats ref names internally as unicode strings (probably
because of Python 3?), which means that at some points it tries to do
os.path.join between the repo path and the unicode of the ref name,
which fails miserably if we construct the repo with a str and not a
unicode. Kludge around this problem.

Fixes issue 172.
2015-11-25 17:52:59 -05:00
mcc
7ce87e34cf readme: document the specific behaviors of hg author translation
Particularly the odd ext:(%xx) feature.
2015-11-12 16:38:41 -08:00
Siddharth Agarwal
75318d3cda manifest: include test and test data
Closes issue #154.
2015-11-08 22:29:26 -08:00
Siddharth Agarwal
6993d261f6 determine_wants: deal with refs being None
Not clear how this is happening, but this should fix it.

Resolves issue #166.
2015-11-08 21:56:38 -08:00
Siddharth Agarwal
bc11bc247c version: bump up to 0.8.3 2015-11-08 21:41:43 -08:00
Siddharth Agarwal
ab1d3e54e9 readme: remove compatibility list
This list was just completely out of date.
2015-11-08 21:40:06 -08:00
Siddharth Agarwal
0daa287392 mark as compatible with Mercurial 3.6 2015-11-08 21:39:00 -08:00
Siddharth Agarwal
3c1f8f5111 push: fix exchangepush for Mercurial 3.2 2015-11-08 21:37:48 -08:00
Durham Goode
fb8f4a418b push: fix exchangepush wrapping
Upstream added opargs to exchange.push and uses it as kwargs to the
pushoperation constructor (59da9543ec6c). There was an attempt to fix this in
hggit (2eb4c0de6bc6) but it passes the exchange.push kwargs directly to
pushoperation(), where we actually need to pull out the opargs and pass them as
kwargs.
2015-10-26 16:00:55 -07:00
Sean Farley
4e3fe9c32a ssh: fix breakage with dulwich update
dulwich 0.11.x changed the way they pass parameters around, so we reformat that
to what hg-git expects.
2015-10-19 11:41:06 -07:00
Sean Farley
ab2d8e0694 tests: update for new merge output 2015-10-16 16:14:51 -07:00
Sean Farley
8edc804959 hggit: adapt push wrapper function for recent hg
We can just accept-and-forward kwargs, which should be nicely
futureproof for a while.
2015-10-15 13:55:30 -07:00
Sean Farley
2c0ba03a59 init: wrap hgutil.url so that we can use isgitsshuri
Previously, cloning from a git ssh uri (e.g. git@github.com:user/repo.git)
would prepend the local file path because Mercurial classifies this as a path
(since there is no scheme at the beginning of the string). This patch fixes
that by doing the same logic as before in hgutil.url so that the correct hgrc
path is written.
2015-10-15 16:04:15 -07:00
Sean Farley
d11745bc53 revsets: use baseset instead of raw list
We fallback to using a standard set if baseset is not available
2015-09-24 16:54:47 -07:00
Durham Goode
5aff23b3c8 paths: mark git repos as valid paths
The latest version of Mercurial validates that a path contains the .hg
directory. This breaks when pulling/pushing to git repos.

This patch makes a gitrepo a valid path as well.
2015-08-24 19:31:52 -07:00
Durham Goode
43376aba98 paths: refactor gitdir detection to a function
Refactors the logic that decides if a local directory is a git directory into a
separate function. This will let us use it later on to integrate with
Mercurial's new paths component.
2015-08-24 19:30:44 -07:00
Sean Farley
12c6012084 update_hg_bookmarks: add wlock 2015-09-24 16:24:27 -07:00
Sean Farley
22991894df git_handler: rename local variable to not shadow import name 2015-05-14 15:15:37 -07:00
Sean Farley
beecd28ea0 git_handler: remove pre-2.8 code for bookmarks 2015-05-15 14:02:55 -07:00