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
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
7bc44b52d9
Add new bdiff based unidiff generation.
2006-01-24 15:02:10 +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
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
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
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
Vadim Gelfer
f1758a02f6
make invalid pattern message not confusing.
2006-01-02 15:52:56 -08:00
Vadim Gelfer
859b47ca42
if hgignore contains errors, print message that is not confusing.
2006-01-02 15:48:16 -08:00
Vadim Gelfer
ff1f653af7
eliminate backtrace when piping output on windows.
...
this fixes issue 54.
2006-01-02 15:25:33 -08:00
Muli Ben-Yehuda
af569cec75
add '_' to several strings
2005-12-29 14:59:19 -06:00
Muli Ben-Yehuda
5ff82e08cd
- duplicate the parent link logic to show child links
...
- don't show trivial parent or children links
2005-12-29 14:51:29 -06:00
Muli Ben-Yehuda
e836b962ee
strictly adher to 80 chars per line
2005-12-28 00:27:05 -06:00
Matt Mackall
3516995227
Error handling for unbundle, fix option line wrapping
2005-12-27 16:18:00 -06:00
Muli Ben-Yehuda
8deda83c58
add --update support to 'hg unbundle'
2005-12-27 16:16:06 -06:00
Benoit Boissinot
32f8c6a746
cleanup of revlog.group when repository is local
...
revlog.group cached every chunk from the revlog, the behaviour was
needed to minimize the roundtrip with old-http.
We now cache the revlog data ~4MB at a time.
The memory used server side when pulling goes down to 35Mo maximum
whereas without the patch more than 160Mo was used when cloning the linux kernel
repository.
The time used by cloning is higher mainly because of the check in revlog.revision.
before
110.25user 20.90system 2:52.00elapsed 76%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+708707minor)pagefaults 0swaps
after
117.56user 18.86system 2:50.43elapsed 80%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+748366minor)pagefaults 0swaps
2005-12-27 13:09:49 -06:00
Benoit Boissinot
0fab1ee06a
remove a duplicate check in commit / fix a bug when merging files
...
followed by revert
2005-12-27 12:52:25 -06:00
Benoit Boissinot
7695d30c35
fix 'hg tag <tagname> <revision>
...
- fix a collision with the option keyword rev and the option
name
- update the tests
2005-12-27 12:52:10 -06:00
Matt Mackall
91766807e2
Re-enable the renamed check fastpath
2005-12-22 13:18:44 -06:00
Matt Mackall
2df834f9a4
Merge with crew
2005-12-16 11:13:08 -06:00
Benoit Boissinot
f88ffe1792
do not copy atime and mtime in util.copyfiles
...
it is unsupported on some fs (vfat) and we don't need to copy
it one clone anyway
2005-12-16 01:32:44 -06:00
Benoit Boissinot
37b8d5d740
reloads manifest and changelog after recovering
2005-12-16 01:32:28 -06:00
Benoit Boissinot
7a029eadd4
fix a bug in hg export --switch-parent
2005-12-16 00:12:00 -06:00
Benoit Boissinot
78898f92b4
if a filename contains spaces, patch adds quote around it
2005-12-15 17:50:10 +01:00
Thomas Arendsen Hein
f18f0c7a93
Better error message (without /.hg appended) when repository is not found.
...
This makes the error for missing default or default-push more readable.
2005-12-15 16:19:23 +01:00
Thomas Arendsen Hein
4df5e527eb
Merge with upstream.
2005-12-15 15:39:20 +01:00
Benoit Boissinot
f5b155c0a3
abort when merging two heads and repository has local changes
2005-12-14 22:19:03 -06:00
Matt Mackall
7c5cce8641
Merge http://sh0n.net/jeffpc/repos/hg-gitweb/
2005-12-14 22:12:18 -06:00
Benoit Boissinot
e3691897e7
add a --switch-parent option to export against the other parent
2005-12-14 21:01:57 -06:00
Benoit Boissinot
d6b2c24c69
hg log -p should show file deletions
2005-12-14 20:53:45 -06:00
Benoit Boissinot
5cdaee582b
quote the filename when calling HGEDITOR
2005-12-14 20:38:11 -06:00
Vadim Gelfer
3ec3d8787c
delete unintended print statement
2005-12-12 07:50:43 -08:00
Josef "Jeff" Sipek
e521b657e9
Remove tabs, and trailing whitespace from hgweb.py
2005-12-12 02:05:08 -05:00
Vadim Gelfer
c968155220
merge with crew
2005-12-11 15:38:42 -08:00
