Nemcio/git-remote-hg
1
0
Fork 0
mirror of https://github.com/mnauw/git-remote-hg.git synced 2026-07-14 21:22:34 +02:00
Code Issues Packages Projects Releases Activity
239 Commits 4 Branches 13 Tags
b3fccddd9fb3d41767f485bff417b3eeaca1d23b
Commit Graph

239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Nauwelaerts
b3fccddd9f Transform gitrange into a more effective revwalk 
Fixes felipec/git-remote-hg#14
Fixes felipec/git-remote-hg#26
 2016-08-13 14:27:57 +02:00
Mark Nauwelaerts
7f99aa2565 Ensure sane ratio in progress reporting 2016-08-13 14:27:54 +02:00
Mark Nauwelaerts
63c742e4a6 Add warning about disabling capability_push mode 
... as the old mode is not so safe and on its way to deprecation.
 2016-08-13 14:27:52 +02:00
Mark Nauwelaerts
6cff0327aa Always update notes on push 
... at least in the sane capability_push mode.
Remove documentation on obsolete push-updates-notes setting.
 2016-08-13 14:27:52 +02:00
Mark Nauwelaerts
5acd0028b4 Ensure transaction safe notes update on push 2016-08-13 14:27:52 +02:00
Mark Nauwelaerts
4f910f65d9 Also still track notes HEAD during import 
Fixes felipec/git-remote-hg#58
 2016-08-13 14:27:45 +02:00
Mark Nauwelaerts
7d82847d52 README: add documentation on subrepo support 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
37cd2f24ac git-hg-helper: add support for subrepo management 
See felipec/git-remote-hg#1
 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
585e36edb9 README: add documentation on additional features such as git-hg-helper 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
dd08e25665 doc: extend manpage with additional config settings 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
5905eb2231 Make a push optionally update notes as well 
... as configured by remote-hg.push-updates-notes setting.
 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
ebdd2f32ab Add support for automagic hg revision identification and pushing 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
f8709175bf Separate head checking and revision pushing 
Also remove some superfluous function parameters and add another one
to avoid using global var.
 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
38741e0bbf Add git-hg-helper 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
e2f68018cd Allow using git-remote-hg as module 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
e62984edde README: add hiding of refs/hg 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
7b53adef7b Avoid refs/hg clutter; keep private implementation refs really private 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
858ca2c68a README: explain effects of capability push implementation 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
093cb8ba94 README: some obligatory fork adjustments 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
cd742bee40 doc: extend manpage with config settings and some technical background 2016-08-01 14:57:01 +02:00
Mark Nauwelaerts
1d0c78eebc test: expect dry-run push test to pass now 2016-08-01 14:57:00 +02:00
Mark Nauwelaerts
8e81bc8515 Add source:dest push refspec support 2016-08-01 14:57:00 +02:00
Mark Nauwelaerts
bd2e030cb0 Add remote bookmark delete support 2016-08-01 14:57:00 +02:00
Mark Nauwelaerts
410e0d74ec test: add test for rename/copy detection 2016-08-01 14:57:00 +02:00
Mark Nauwelaerts
93dd913590 Implement remote-helper push capability 
Push capability is used depending on remote-hg.capability-push setting and ...
* handles dry-run properly,
* passes copy and rename information onto Mercurial

Fixes felipec/git-remote-hg#61
 2016-08-01 14:56:42 +02:00
Mark Nauwelaerts
418af65bf0 Support processing git-fast-export's filecopy and filerename 2016-08-01 14:15:47 +02:00
Mark Nauwelaerts
d7db83bd2c Handle pushing bookmarks without pushing changesets 
Also prevent errors when trying to push no changesets to a peer, which some
combinations of versions and extensions do not handle well;
see e.g. as in felipec/git-remote-hg#32 and felipec/git-remote-hg#22
 2016-08-01 14:12:09 +02:00
Mark Nauwelaerts
3ea455e7e7 test: add failing test for pushing a bookmark without changesets 2016-08-01 12:21:30 +02:00
Mark Nauwelaerts
fd210eb002 Also ensure 2-way sync of remote bookmarks to proxy 
... rather than only adding remote ones locally and never deleting.
In particular, makes fetch --prune work.

Fixes felipec/git-remote-hg#15
 2016-08-01 12:21:30 +02:00
Mark Nauwelaerts
b852ee18b2 Simplify calculation of revision range to be fetched. 
Fixes felipec/git-remote-hg#14
 2016-08-01 12:21:30 +02:00
Mark Nauwelaerts
c3f02d39ad Add notes based on current notes ref 
Fixes felipec/git-remote-hg#58
 2016-08-01 12:21:25 +02:00
Felipe Contreras
822c6e4b03 Avoid deprecated bookmarks.write() 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2016-05-17 21:26:18 -05:00
Felipe Contreras
b6e9475918 readme: mention Mercurial dependency 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
v0.3 		2016-05-16 23:37:08 -05:00
Lars Noschinski
517ceb91ac Fix import of broken committers 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2016-05-16 22:44:49 -05:00
Felipe Contreras
114804f0cb travis: add more Mercurial versions 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2016-05-16 22:29:50 -05:00
Felipe Contreras
b022367aef test: temporarily disable hg-git tests 
They work, but they need too many changes in different packages.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2016-05-16 22:29:50 -05:00
Felipe Contreras
18626d346f Revert "test: use C.UTF-8 locale in tests" 
This reverts commit f53a8653ab.

It turns out Debian and Fedora do provide the C.UTF-8 locale, but other
distributions don't.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2016-05-16 22:29:50 -05:00
Felipe Contreras
b81ec14c2e Improve hg-git compatibility 
Recent versions of Mercurial check if a filectx is the same as the
parents, and avoid creating a new filelog. This is what we want, but
hg-git doesn't do that.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2016-05-16 22:29:50 -05:00
Felipe Contreras
1e279075dc Add compatibility for Mercurial v3.2 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2016-05-16 22:29:50 -05:00
Felipe Contreras
02a0a59a4b travis: force version of hg-git 
The latest that works.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2016-05-16 17:56:25 -05:00
Felipe Contreras
185852eac4 test: cleanup hg-git test 
We don't need hgext.bookmarks since a long long time (ever).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2014-06-03 06:00:02 -05:00
Felipe Contreras
29a0d8a0e3 test: skip tests with broken hg-git compatibility 
https://bitbucket.org/durin42/hg-git/issue/115/

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2014-06-02 18:42:17 -05:00
Felipe Contreras
aa528c9649 Fix memfilectx API change 
It will change in 3.1.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2014-06-02 17:49:56 -05:00
Felipe Contreras
018aa4753b Improve version parsing 
Development versions have extra stuff in the form of
'version+distance-id'.

Let's assume we are already in the next major version when in
development.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2014-06-02 17:49:29 -05:00
Felipe Contreras
f173208406 build: don't install docs by default 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2014-05-31 15:58:33 -05:00
Felipe Contreras
e7df347fab readme: fix not about v2.0 
It didn't get in.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2014-05-31 15:49:28 -05:00
Brian Gernhardt
0de8aa91f4 build: avoid non-portable install -D 
BSD install doesn't understand the -D option. Use a separate install
command to create the directory (with the -d option) before installing
the file.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2014-05-31 15:41:28 -05:00
Paul Wise
22d9794c11 test: add compatibility with Debian hg-git package 
Debian has named the hggit python module as hgext.git.

Signed-off-by: Paul Wise <pabs3@bonedaddy.net>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2014-05-30 17:37:01 -05:00
Paul Wise
f53a8653ab test: use C.UTF-8 locale in tests 
The en_US.UTF-8 locale is not guaranteed to exist, and if it doesn't,
several tests fail.

Signed-off-by: Paul Wise <pabs3@bonedaddy.net>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2014-05-30 17:37:01 -05:00
Paul Wise
b4c63539f2 Ignore the generated manual page 
Signed-off-by: Paul Wise <pabs3@bonedaddy.net>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2014-05-30 17:37:01 -05:00