Benoit Boissinot
daf8a61910
return a non-zero exit code when a merge failed
2006-01-30 12:02:06 +13:00
Thomas Arendsen Hein
b9322fe2c1
Added missing quote in warning text to tests, too.
2006-01-29 14:36:11 +01:00
Thomas Arendsen Hein
6a7e5f1bfa
Added missing quote in warning text.
2006-01-29 14:33:12 +01:00
Matt Mackall
51ee941af7
Fix revlog signature check for empty revlogs
2006-01-29 20:30:41 +13:00
Matt Mackall
9006bd163c
Add revlog version signature check
2006-01-29 20:27:58 +13:00
Matt Mackall
6f37e02b78
doc: clone and outgoing point to pull for valid path docs
2006-01-29 20:13:43 +13:00
Matt Mackall
7b07f944d2
deprecate the rawcommit command
2006-01-29 19:06:42 +13:00
Matt Mackall
08e52a57b8
convert-repo: use commit rather than rawcommit
2006-01-29 18:38:56 +13:00
Matt Mackall
f7a7ecf39e
convert-repo: automatically create empty map file
2006-01-29 17:22:03 +13:00
Benoit Boissinot
b75edb98a4
deprecate the use of 'hg tag NAME [REV]'
...
add some tests and some doc
2006-01-29 17:12:31 +13:00
Matt Mackall
d2f2e55e1e
hgweb: show copy/rename links in file history
2006-01-29 17:10:38 +13:00
Peter van Dijk
c8cea7f5b8
unbreak templates/summary-gitweb.tmpl
2006-01-29 00:31:11 +01:00
Matt Mackall
98cc47a8ba
Fix comment syntax
2006-01-29 12:23:52 +13:00
Peter van Dijk
45d8535751
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
2006-01-29 00:18:52 +01:00
Matt Mackall
5f788a1aab
hgweb: fix breakage on manifest subdirs from path cleaning
2006-01-29 11:17:54 +13:00
Petr Mazanec
3ad377b167
Process working files through encode filters in dodiff()
2006-01-29 10:10:16 +13:00
Christian Ebert
73585d70f6
Use of opendiff as merge program on MacOS X
...
Hello,
If one has the developer tools installed on MacOS X there's
another alternative for the merge program.
Invocation could be done somehow like in the attached patch for
hgmerge.
2006-01-29 10:10:00 +13:00
Matt Mackall
625ac404ef
Clean up paths passed to hgweb
...
(spotted by Peter van Dijk)
2006-01-29 09:10:13 +13:00
Benoit Boissinot
b1d5f1ed5b
add removed files to the changelog file list
...
- this should allow better detection of removed file
when walking in the history (like hg log)
it doesn't help for the fast path of hg log where
we only look at the filelog
- users of the changelog file list shouldn't assume
anymore that the file still exist (anyway it won't
be found in the manifest like in 2e92bd60edac)
- fix the tests (some hashes changed)
2006-01-29 08:38:31 +13:00
mason@suse.com
1ddefaa316
Remove duplicate bunidiff code from hgdiff, importing from mdiff.py instead
2006-01-28 17:16:15 +13:00
Alexis S. L. Carvalho
12832e1570
bash_completion: ignore hg help error messages
...
They are usually not useful when you're completing stuff and end up
cluttering the screen.
2006-01-27 12:15:39 +01:00
Alexis S. L. Carvalho
01b4cbf805
bash_completion: always use single quotes with compgen -W
...
This avoids a bug in bash 2.05a
2006-01-27 12:11:14 +01:00
Alexis S. L. Carvalho
af689bde09
bash_completion: be more careful about whitespaces
...
- use awk to parse the output of hg help.
- print one completion candidate per line
- print the debug commands after regular commands
(this eases the shell side of the parsing)
- don't print aliases that are simple abbreviations
(e.g. up/update, id/identify)
2006-01-27 12:10:35 +01:00
Thomas Arendsen Hein
6ca7b37617
Added hint to hg-ssh that you can use shell pattern matching.
2006-01-26 16:37:31 +01:00
Thomas Arendsen Hein
2ac2a1e7e3
_hg_status improvements in bash_completion:
...
- Use "hg status -n" option instead of cut command.
- Sort status flags accoring to "hg status --help"
- Show deleted files instead of "hg remove"d for "hg remove"
2006-01-26 15:07:46 +01:00
Alexis S. L. Carvalho
606e1d0e53
bash_completion: small updates and fixes
...
- $result in _hg_commands is not an array
- use "hg status ."
- update "hg cat" completion
- let bash itself generate the default completion
2006-01-26 14:52:26 +01:00
mason@suse.com
7bc44b52d9
Add new bdiff based unidiff generation.
2006-01-24 15:02:10 +13:00
Matt Mackall
8ad9960f06
contrib: add Chris Mason's stand-alone diff tool
...
This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.
2006-01-24 14:49:19 +13:00
efiring@manini.soest.hawaii.edu
75812b6144
Fix rcpath for hgwebdir case (sys.argv is empty)
2006-01-24 13:59:11 +13:00
Robin Farine
bf07bbbd01
copy & rename can ignore removed source files
...
As mercurial now distinguishes deleted files from removed files,
we can skip removed source files while copying or renaming.
2006-01-24 13:59:01 +13:00
Robin Farine
76456b288f
copy/rename '.' or '..' correctly
2006-01-24 13:57:09 +13:00
Matt Mackall
b949194ec7
Merge with Eric
2006-01-24 13:50:40 +13:00
Matt Mackall
f822ba591d
Merge with crew
2006-01-24 13:49:20 +13:00
Matt Mackall
266a9b9bd7
[hgweb] Prevent search engine bots from indexing the entire repository
2006-01-23 16:36:44 +13:00
Thomas Arendsen Hein
87df0f7aed
Copy manifest map before modifying it (see issue86)
2006-01-22 18:54:25 +01:00
Eric Hopper
ea260f4ca1
This fixes a bug that Chris Mason found. As for a test case, I can't
...
think of one. It's a very weird case. Basically, if there is a file
listed as changed in the changelog entry, but not showing up in any
of the associated manifest entries, hg would abort when trying to
create a changeset. Now it just decides the file must not have any
versions relevant to the changeset.
2006-01-20 09:35:43 -08:00
Benoit Boissinot
daed3a292f
fix for hgweb.filterfiles
...
some variable weren't converted, fix a possible out of range error
2006-01-18 17:07:48 +01:00
Benoit Boissinot
4999ac2c31
make the order of the arguments for filterfiles consistent
...
fix a bug where the order was reversed
2006-01-18 16:55:05 +01:00
Benoit Boissinot
6bcc2fc12e
correct the relative path when walking from a subdir
...
- yield the correct relative path when walking from a subdir
(regardless the walk is repo-wide or not)
- have a consistent output from all commands: filename are
absolute when no patterns are specified and relative otherwise.
2006-01-17 16:10:22 +01:00
Thomas Arendsen Hein
89d8ceceb3
Added test for relative paths and all status flags for 'hg status'
2006-01-17 16:00:55 +01:00
Thomas Arendsen Hein
6d0076e114
Added test for the currently broken addremove with the expected output.
2006-01-17 15:03:47 +01:00
Benoit Boissinot
898dc32925
fix locate broken since fe09b9cb31e4
...
- fix the keyword arguments for walk in commands.locate
- implement 'hg locate -r <rev>'
- add a test for 'hg locate'
2006-01-16 15:51:09 +01:00
Thomas Arendsen Hein
bb0c63560c
Restored old behaviour for 'hg co' and 'hg co -C' for removed files.
2006-01-12 21:55:19 +01:00
Thomas Arendsen Hein
f3bc2ce43a
Adjusted all but one test output for the new behaviour of localrepo.changes()
2006-01-12 21:02:38 +01:00
Thomas Arendsen Hein
c057b50e85
Distinguish removed and deleted files. Tests are not fixed yet.
...
hg status will now show "R filename" for "hg rm"ed files and
"! filename" for files which were deleted manually.
Manually deleted files are considered unmodified.
2006-01-12 13:58:36 +01:00
Thomas Arendsen Hein
f5ef5dad07
Renamed c, a, d, u to modified, added, removed, unknown for users of changes()
2006-01-12 13:35:09 +01:00
Thomas Arendsen Hein
ac4248da86
Make localrepo.changes() internally distinguish between removed and deleted.
2006-01-12 12:22:28 +01:00
Thomas Arendsen Hein
a31bbb6f32
Cleaned up localrepo.changes()
2006-01-12 11:32:07 +01:00
Thomas Arendsen Hein
43e98f78a7
Cleanup of indentation, spacing, newlines, strings and line length
2006-01-12 07:57:58 +01:00
Vincent Danjean
0df40f4f57
hgk.py is not a script (no '#!' line needed)
2006-01-12 06:29:06 +01:00
