Commit Graph

7303 Commits

Author SHA1 Message Date
Patrick Mezard
98804940d3 patch: rewrite diffstat with util.filter()
Simpler and works under Windows.
2008-10-27 22:57:55 +01:00
Benoit Boissinot
311e4870b2 use our urlopener (proxy handling, etc) instead of urllib 2008-10-27 21:50:16 +01:00
Benoit Boissinot
214af7ec3c factor out the url handling from httprepo
Create url.py to handle all the url handling:
- proxy handling
- workaround various python bugs
- handle username/password embedded in the url
2008-10-27 21:50:01 +01:00
Benoit Boissinot
cd80319bc5 httprepo: factor out proxy handling 2008-10-27 17:48:05 +01:00
Benoit Boissinot
facb3df783 test-http-proxy: print the log from the proxy 2008-10-27 17:37:37 +01:00
Benoit Boissinot
1af2a5203a merge with dsop 2008-10-27 13:52:55 +01:00
Adrian Buehlmann
836ce2131c test-init: add test with format.usefncache=false 2008-10-27 13:22:45 +01:00
Benoit Boissinot
7c4c2ad96b merge with crew 2008-10-27 13:17:26 +01:00
Patrick Mezard
ef4d9a9d32 patch: fix patched files records in externalpatcher() 2008-10-26 17:26:28 +01:00
Patrick Mezard
0147011be6 Merge with crew-stable 2008-10-26 14:02:32 +01:00
Patrick Mezard
844a06bfd6 convert: fix non-ASCII filenames retrieval from git sources (issue 1360) 2008-10-26 13:23:02 +01:00
Dmitriy Taychenachev
c9afc598f9 bookmarks: do nothing if commit was not successful. 2008-10-26 17:08:48 +08:00
Joel Rosdahl
0cbdb6d6f6 bookmarks: Add tests 2008-10-25 19:05:52 +02:00
Joel Rosdahl
274bad2f13 bookmarks: Strip bookmark names of whitespace, just like tag names 2008-10-25 19:05:52 +02:00
Joel Rosdahl
bfd3d5daa1 bookmarks: Correctly reject newlines in bookmark names
Without this fix, a single newline is a valid bookmark name since
strip() removes it.
2008-10-25 19:05:52 +02:00
Joel Rosdahl
b77bc118fe bookmarks: Require a bookmark name when a revision is specified 2008-10-25 19:05:52 +02:00
Joel Rosdahl
1d75d9e1c8 bookmarks: Improve documentation 2008-10-25 19:05:52 +02:00
Joel Rosdahl
bdb8cd591c bookmarks: Avoid unconditional forwarding of bookmarks for the null revision
This patch fixes the following minor problem:

% hg bookmark -r null test
% hg bookmarks
   test                      -1:000000000000
[...]
% hg commit
% hg bookmarks
 * test                      17:861ce7a241f9

That is: Bookmarks referring to the null revision are always forwarded
to the current revision.
2008-10-25 19:05:52 +02:00
Joel Rosdahl
3cdea78a80 bookmarks: Rename --move to --rename
To me, --move sounds like "make an existing bookmark refer to another
revision", but --move currently means "rename an existing bookmark".
This patch renames the switch to --rename to make it easier to
understand.
2008-10-25 19:05:52 +02:00
Joel Rosdahl
8591a1ba0e bookmarks: Require new bookmark name when renaming 2008-10-25 19:05:52 +02:00
Joel Rosdahl
2c54d20df7 bookmarks: Only save undo.bookmarks if bookmarks exist
Otherwise the command will abort when there is no .hg/bookmarks file.
2008-10-25 19:05:52 +02:00
Joel Rosdahl
88b2c9f687 bookmarks: Avoid long lines 2008-10-25 19:05:42 +02:00
Joel Rosdahl
010e05aba6 bookmarks: Fix spelling and grammar 2008-10-25 16:30:11 +02:00
Joel Rosdahl
4f734fc67a bookmarks: Remove trailing space 2008-10-25 16:29:58 +02:00
Benoit Boissinot
f9d86548a2 merge with crew 2008-10-25 15:34:58 +02:00
Patrick Mezard
bad493a8fd test-mq-qimport: fix URL generation under windows 2008-10-25 13:24:14 +02:00
Patrick Mezard
7985f2f92e test-patchbomb: write in binary mode, force non-interactive mode (win32) 2008-10-27 22:07:39 +01:00
Bartosz SKOWRON
6ad08c06ee patch: remove double variables in copyfile() func 2008-10-24 20:46:56 +02:00
Benoit Boissinot
566c5d9e55 findincoming: build the correct list from the start 2008-10-24 16:20:53 +02:00
Thomas Arendsen Hein
912f59bb30 Remove trailing spaces. 2008-10-24 15:00:40 +02:00
Thomas Arendsen Hein
78d2b2a81c Document config option format.usefncache and improve format.usestore docs. 2008-10-24 14:58:24 +02:00
Adrian Buehlmann
42f1fb6f03 add format.usefncache config option (default is true)
This enables for example "hg clone --config format.usefncache=0" which
creates a non-fncache repository, which then can be read by Mercurial
versions before 74698d160f52.
2008-10-24 10:31:51 +02:00
Patrick Mezard
54f7c66fa0 convert: read git output in binary mode under Windows (issue 1359) 2008-10-23 14:05:11 +02:00
Patrick Mezard
08e847d4ef util: add 'mode' argument to popen() 2008-10-23 15:35:54 +02:00
Christian Ebert
44f3c4c080 hgrc.5: explain order of mail.charsets
TODO: add mail.charsets section to hgrc.5.ja.txt
2008-10-22 11:57:20 +02:00
Christian Ebert
b218f8d45e test 8abe3f27975c: grep w/ match in last line w/o newline
Last character in match output omitted to avoid infinite loop.
2008-10-24 08:16:01 +02:00
David Soria Parra
fc2ddf3386 Bookmarks: Add the bookmarks extension
Mercurial bookmarks are local moveable pointers to changesets.
If you commit a changeset that is based on a changeset that has a
bookmark on it, the bookmark is forwarded to the new changeset.

Thanks to Ian Dees, Ronny Pfannschmidt for their patches,
Thanks to ronny, tonfa, prianha, mpm, #mercurial for their comments
and their support that helped me to get things done.
2008-10-22 21:53:27 +02:00
Matt Mackall
6ccb6c0637 zeroconf: don't break on hg showconfig 2008-10-24 11:35:47 -05:00
Benoit Boissinot
4f2e35bc33 fix pull racing with push/commit (issue1320)
changegroup() has a problem when nodes which does not descend from a node
in <bases> are added to remote after the discovery phase.
If that happens, changegroup() won't send the correct set of nodes, ie.
some nodes will be missing.
To correct it we have to find the set of nodes that both remote and self
have (called <common>), and send all the nodes not in <common>.

This fix has some overhead, in the worst case it will re-send a whole branch.

A proper fix to avoid this overhead might be to change the protocol so that
the <common> nodes are sent (instead of the <bases> of the missing nodes).
2008-10-21 17:00:35 +02:00
Patrick Mezard
a90ccace70 convert: correctly detect missing revlog for root revisions 2008-10-23 23:03:09 +02:00
Patrick Mezard
f10fc4ae24 convert: ignore hg source errors with hg.ignoreerrors (issue 1357)
This flag makes missing revlog errors to be ignored which allow broken
repositories to be fixed by converting them from and to Mercurial.
2008-10-21 21:24:47 +02:00
Matt Mackall
233bc0e342 grep: avoid infinite loop when trailing newline is missing 2008-10-23 14:56:16 -05:00
Dirkjan Ochtman
f73840b37b merge with crew-stable 2008-10-20 14:57:56 +02:00
Thomas Arendsen Hein
380f8d8da9 spaces->tabs in one line of a C extension for consistency 2008-10-20 14:53:53 +02:00
Dirkjan Ochtman
e085823cf1 clean up trailing spaces 2008-10-20 14:51:55 +02:00
Thomas Arendsen Hein
94f908042c Fix Debian bug #494889 (fetching from static-http://... broken)
Changeset 055df4ac4b13 which fixed issue965 (hg clone static-http
does not work for empty repos) broke cloning of repos with old layout
(without store) via static-http.

This fix makes cloning from old-style repositories possible again,
but will not allow cloning of empty old-style repositories as this
can not be detected reliably.
2008-10-19 19:49:56 +02:00
Adrian Buehlmann
f3f0f9ecd6 introduce fncache repository layout
* adds a new entry 'fncache' to '.hg/requires' for new repos
* writes new file '.hg/store/fncache'
* hash-encodes filenames with long paths (issue839)
* encodes Windows reserved filenames (issue793)
2008-10-19 19:12:07 +02:00
Edouard Gomez
bea37bac1c convert: return remote branches in git source
When converting git repos, all stuff happening on branches
seems to be ignored.

This is caused by the fact a "git clone" of a remote git
repo has all its branches prefixed with "origin/". By
chance, the "origin/master" branch is always linked to a
local "master" branch. So getheads() returns only the
master head, and it ignores all the other heads.

Make sure getheads() returns all heads, forcing remote
branches to be return by git-rev-parse.
2008-10-19 00:32:23 +02:00
Alexander Solovyov
3aa9ebf062 bisect with command: ability to skip revision or abort bisection 2008-10-16 19:40:09 +03:00
Patrick Mezard
910e49f24f test-doctest: remove TERM env variable only if it's there 2008-10-11 16:40:59 +02:00