Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 17:10:38 +1300] rev 1653
hgweb: show copy/rename links in file history
Peter van Dijk <peter@dataloss.nl> [Sun, 29 Jan 2006 00:31:11 +0100] rev 1652
unbreak templates/summary-gitweb.tmpl
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 12:23:52 +1300] rev 1651
Fix comment syntax
Peter van Dijk <peter@dataloss.nl> [Sun, 29 Jan 2006 00:18:52 +0100] rev 1650
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 11:17:54 +1300] rev 1649
hgweb: fix breakage on manifest subdirs from path cleaning
Petr Mazanec <petr.mazanec@tiscali.cz> [Sun, 29 Jan 2006 10:10:16 +1300] rev 1648
Process working files through encode filters in dodiff()
Christian Ebert <blacktrash@gmx.net> [Sun, 29 Jan 2006 10:10:00 +1300] rev 1647
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.
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 09:10:13 +1300] rev 1646
Clean up paths passed to hgweb
(spotted by Peter van Dijk)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 29 Jan 2006 08:38:31 +1300] rev 1645
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 5ecf05541e11)
- fix the tests (some hashes changed)
mason@suse.com [Sat, 28 Jan 2006 17:16:15 +1300] rev 1644
Remove duplicate bunidiff code from hgdiff, importing from mdiff.py instead
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 27 Jan 2006 12:15:39 +0100] rev 1643
bash_completion: ignore hg help error messages
They are usually not useful when you're completing stuff and end up
cluttering the screen.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 27 Jan 2006 12:11:14 +0100] rev 1642
bash_completion: always use single quotes with compgen -W
This avoids a bug in bash 2.05a
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 27 Jan 2006 12:10:35 +0100] rev 1641
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)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Jan 2006 16:37:31 +0100] rev 1640
Added hint to hg-ssh that you can use shell pattern matching.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Jan 2006 15:07:46 +0100] rev 1639
_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"
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 26 Jan 2006 14:52:26 +0100] rev 1638
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
mason@suse.com [Tue, 24 Jan 2006 15:02:10 +1300] rev 1637
Add new bdiff based unidiff generation.
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2006 14:49:19 +1300] rev 1636
contrib: add Chris Mason's stand-alone diff tool
This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.
efiring@manini.soest.hawaii.edu [Tue, 24 Jan 2006 13:59:11 +1300] rev 1635
Fix rcpath for hgwebdir case (sys.argv is empty)
Robin Farine <robin.farine@terminus.org> [Tue, 24 Jan 2006 13:59:01 +1300] rev 1634
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.
Robin Farine <robin.farine@terminus.org> [Tue, 24 Jan 2006 13:57:09 +1300] rev 1633
copy/rename '.' or '..' correctly
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2006 13:50:40 +1300] rev 1632
Merge with Eric
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2006 13:49:20 +1300] rev 1631
Merge with crew
Eric Hopper <hopper@omnifarious.org> [Fri, 20 Jan 2006 09:35:43 -0800] rev 1630
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.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 22 Jan 2006 18:54:25 +0100] rev 1629
Copy manifest map before modifying it (see issue86)
Matt Mackall <mpm@selenic.com> [Mon, 23 Jan 2006 16:36:44 +1300] rev 1628
[hgweb] Prevent search engine bots from indexing the entire repository
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 18 Jan 2006 17:07:48 +0100] rev 1627
fix for hgweb.filterfiles
some variable weren't converted, fix a possible out of range error
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 18 Jan 2006 16:55:05 +0100] rev 1626
make the order of the arguments for filterfiles consistent
fix a bug where the order was reversed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 17 Jan 2006 16:10:22 +0100] rev 1625
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.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 17 Jan 2006 16:00:55 +0100] rev 1624
Added test for relative paths and all status flags for 'hg status'
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 17 Jan 2006 15:03:47 +0100] rev 1623
Added test for the currently broken addremove with the expected output.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Jan 2006 15:51:09 +0100] rev 1622
fix locate broken since 63799b01985c
- fix the keyword arguments for walk in commands.locate
- implement 'hg locate -r <rev>'
- add a test for 'hg locate'
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 21:55:19 +0100] rev 1621
Restored old behaviour for 'hg co' and 'hg co -C' for removed files.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 21:02:38 +0100] rev 1620
Adjusted all but one test output for the new behaviour of localrepo.changes()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 13:58:36 +0100] rev 1619
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.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 13:35:09 +0100] rev 1618
Renamed c, a, d, u to modified, added, removed, unknown for users of changes()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 12:22:28 +0100] rev 1617
Make localrepo.changes() internally distinguish between removed and deleted.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 11:32:07 +0100] rev 1616
Cleaned up localrepo.changes()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 07:57:58 +0100] rev 1615
Cleanup of indentation, spacing, newlines, strings and line length
Vincent Danjean <Vincent.Danjean@ens-lyon.org> [Thu, 12 Jan 2006 06:29:06 +0100] rev 1614
hgk.py is not a script (no '#!' line needed)
Guy Brand <gb@isis.u-strasbg.fr> [Tue, 10 Jan 2006 13:12:13 +0100] rev 1613
Added archives links to gitweb template
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Jan 2006 16:34:20 +0100] rev 1612
Adjusted test output to match new hgignore error messages.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 02 Jan 2006 15:52:56 -0800] rev 1611
make invalid pattern message not confusing.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 02 Jan 2006 15:48:16 -0800] rev 1610
if hgignore contains errors, print message that is not confusing.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 02 Jan 2006 15:25:33 -0800] rev 1609
eliminate backtrace when piping output on windows.
this fixes issue 54.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 02 Jan 2006 14:31:25 -0800] rev 1608
document revert command more accurately.
this fixes issue 87.
Muli Ben-Yehuda <mulix@mulix.org> [Thu, 29 Dec 2005 14:59:19 -0600] rev 1607
add '_' to several strings
Muli Ben-Yehuda <mulix@mulix.org> [Thu, 29 Dec 2005 14:51:29 -0600] rev 1606
- duplicate the parent link logic to show child links
- don't show trivial parent or children links
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 28 Dec 2005 07:22:26 -0800] rev 1605
merge with mainline
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 28 Dec 2005 07:13:52 -0800] rev 1604
add --plain option to patchbomb.
this omits the hg patch headers. it makes a patchbomb email look like
a regular email with a patch.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 28 Dec 2005 07:11:46 -0800] rev 1603
make patchbomb work with recent changes to export
Muli Ben-Yehuda <mulix@mulix.org> [Wed, 28 Dec 2005 00:27:05 -0600] rev 1602
strictly adher to 80 chars per line
Matt Mackall <mpm@selenic.com> [Tue, 27 Dec 2005 16:18:00 -0600] rev 1601
Error handling for unbundle, fix option line wrapping
Muli Ben-Yehuda <mulix@mulix.org> [Tue, 27 Dec 2005 16:16:06 -0600] rev 1600
add --update support to 'hg unbundle'
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 27 Dec 2005 13:12:53 -0600] rev 1599
remove the gpg stuff from hgeditor (superseded by the signing extension)
remove the gpg stuff from hgeditor, update the comments to make it clear
it can be used to show a diff while commiting
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 27 Dec 2005 13:09:49 -0600] rev 1598
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
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 27 Dec 2005 12:52:25 -0600] rev 1597
remove a duplicate check in commit / fix a bug when merging files
followed by revert
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 27 Dec 2005 12:52:10 -0600] rev 1596
fix 'hg tag <tagname> <revision>
- fix a collision with the option keyword rev and the option
name
- update the tests
Matt Mackall <mpm@selenic.com> [Thu, 22 Dec 2005 13:18:44 -0600] rev 1595
Re-enable the renamed check fastpath
Matt Mackall <mpm@selenic.com> [Fri, 16 Dec 2005 11:13:08 -0600] rev 1594
Merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Dec 2005 17:50:10 +0100] rev 1593
if a filename contains spaces, patch adds quote around it
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Dec 2005 11:12:08 -0600] rev 1592
gpg signing extension for hg
the principle is almost the same as how tags work:
.hgsigs stores signatures, localsigs stores local signatures
the format of the signatures is:
nodeid sigversion base64_detached_sig
sigversion 0 signs simply the nodeid (maybe we would like
to sign other things in the future).
you can associate fingerprints with roles in hgrc like:
[gpg]
fingerprint_of_a_key_without_spaces = release
fingerprint_of_a_key_without_spaces = contributor, testing
the key used for signing can be specified on the command line or
via hgrc (key =)
thanks to Eric Hopper for testing and bugfixing
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Dec 2005 01:32:44 -0600] rev 1591
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
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Dec 2005 01:32:28 -0600] rev 1590
reloads manifest and changelog after recovering
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Dec 2005 00:12:00 -0600] rev 1589
fix a bug in hg export --switch-parent
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 15 Dec 2005 16:19:23 +0100] rev 1588
Better error message (without /.hg appended) when repository is not found.
This makes the error for missing default or default-push more readable.
Daniel Kobras <kobras@debian.org> [Thu, 15 Dec 2005 15:40:14 +0100] rev 1587
Less annoying directory completion (see http://bugs.debian.org/343458)
The current bash completion script is quite painful in conjuntion with
deep directory trees because it adds a space after each successful
directory completion. Eg. "hg clone /ho<tab>" is completed to "hg clone
/home " when what you really want is "hg clone /home/" (assuming the
complete path to the repository looks like /home/foo/hg...).
That's because the 'complete' command does not know about the type of
completion it receives from the _hg shell function. When only a single
completion is returned, it assumes completion is complete and tells
readline to add a trailing space. This behaviour is usually wanted, but
not in the case of directory completion.
I've attached a patch that circumvents this problem by only returning
successful completions for directories that contain a .hg subdirectory.
If no repositories are found, no completions are returned either, and
bash falls back to ordinary (filename) completion. I find this behaviour
a lot less annoying than the current one.
Alternative: Use option nospace for the 'complete' command and let _hg
itself take care of adding a trailing space where appropriate. That's a
far more intrusive change, though.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 15 Dec 2005 15:39:20 +0100] rev 1586
Merge with upstream.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 12 Dec 2005 07:50:43 -0800] rev 1585
delete unintended print statement
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 11 Dec 2005 15:38:42 -0800] rev 1584
merge with crew
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 04 Nov 2005 11:51:01 -0800] rev 1583
make mercurial look in more places for config files.
now it searches <install dir>/etc/mercurial, /etc/mercurial, and user
hgrc.
this allows site-wide configuration to be shared over automounted nfs
partition, instead of chenging on every system. option of having local
configuration on every system remains.
old code for searching /etc/mercurial/hgrc.d never worked, this code
is tested and works.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Dec 2005 14:10:38 +0100] rev 1582
fix the cat command
- improve localrepo.walk when passed a node
- make the differents walk commands in commands.py accept a node
- change commands.cat to walk over a revision
- add a test
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Dec 2005 22:19:03 -0600] rev 1581
abort when merging two heads and repository has local changes
Matt Mackall <mpm@selenic.com> [Wed, 14 Dec 2005 22:12:18 -0600] rev 1580
Merge http://sh0n.net/jeffpc/repos/hg-gitweb/
Josef "Jeff" Sipek <jeffpc@optonline.net> [Mon, 12 Dec 2005 02:05:08 -0500] rev 1579
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net> [Mon, 12 Dec 2005 01:25:24 -0500] rev 1578
[hgweb] Remove reference to a non-existing file
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 10 Dec 2005 00:26:32 -0500] rev 1577
[hgweb] Fixed up bad link
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 10 Dec 2005 00:09:13 -0500] rev 1576
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net> [Mon, 05 Dec 2005 07:07:40 -0500] rev 1575
[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style
Namespace polution prevention (manifest vs. tagmanifest - shouldn't be a problem yet)
File annotate updated
File revision now has commit info
Josef "Jeff" Sipek <jeffpc@optonline.net> [Mon, 05 Dec 2005 05:01:28 -0500] rev 1574
[hgweb] More gitweb style related fixes
Fixed manifest link on tags page
Fixed changeset link on manifest page
Josef "Jeff" Sipek <jeffpc@optonline.net> [Mon, 05 Dec 2005 04:49:37 -0500] rev 1573
File revision style fixed
Josef "Jeff" Sipek <jeffpc@optonline.net> [Mon, 05 Dec 2005 04:30:47 -0500] rev 1572
[hgweb] Initial import of the "gitweb" style
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Dec 2005 21:01:57 -0600] rev 1571
add a --switch-parent option to export against the other parent
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Dec 2005 20:53:45 -0600] rev 1570
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Dec 2005 20:38:11 -0600] rev 1569
quote the filename when calling HGEDITOR
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 01 Dec 2005 10:51:45 -0600] rev 1568
make all commands be repo-wide by default
- refactor code in commands.py so that:
if no pattern is given, the command will be repo-wide
else it will work on the working dir
- update the doc
- fix the tests
TK Soh <teekaysoh@yahoo.com> [Thu, 01 Dec 2005 10:51:33 -0600] rev 1567
make command defaults works for aliases
Arun Sharma <arun@sharma-home.net> [Thu, 01 Dec 2005 10:48:42 -0600] rev 1566
Handle hg under /
Robin Farine <robin.farine@terminus.org> [Thu, 01 Dec 2005 10:48:35 -0600] rev 1565
fix rename --after
Benoit Boissinot <bboissin@gmail.com> [Thu, 01 Dec 2005 10:48:29 -0600] rev 1564
Re: [PATCH 2 of 3] remove walk warning about nonexistent files
On 11/15/05, Robin Farine <robin.farine@terminus.org> wrote:
> # HG changeset patch
> # User Robin Farine <robin.farine@terminus.org>
> # Node ID ce0a3cc309a8d1e81278ec01a3c61fbb99c691f4
> # Parent feb77e0951e74d75c213e8471f107fdcc124c876
> remove walk warning about nonexistent files
>
> diff -r feb77e0951e7 -r ce0a3cc309a8 mercurial/dirstate.py
> --- a/mercurial/dirstate.py Tue Nov 15 08:42:45 2005 +0100
> +++ b/mercurial/dirstate.py Tue Nov 15 08:59:50 2005 +0100
> @@ -336,9 +336,6 @@
> try:
> st = os.lstat(f)
> except OSError, inst:
> - if ff not in dc: self.ui.warn('%s: %s\n' % (
> - util.pathto(self.getcwd(), ff),
> - inst.strerror))
> continue
> if stat.S_ISDIR(st.st_mode):
> cmp1 = (lambda x, y: cmp(x[1], y[1]))
this break some tests,
a better fix would be to check if ff can be a directory prefix from files in dc
you can try the attached patch.
Benoit
Robin Farine <robin.farine@terminus.org> [Thu, 01 Dec 2005 10:48:22 -0600] rev 1563
export patkind() from util
Christian Boos <cboos@neuf.fr> [Thu, 01 Dec 2005 10:48:18 -0600] rev 1562
Fix walkhelper on windows.
The ''seen'' dictionary stores paths in canonical form,
so the walkhelp must also provide paths in that form,
otherwise the changed files are listed twice.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 29 Nov 2005 22:29:14 +0100] rev 1561
disallow '\n' and '\r' in tag names
add a test for disallowed characters in tag names
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 29 Nov 2005 18:06:23 +0100] rev 1560
Merge with http://hg.omnifarious.org/~hopper/mercurial
Eric Hopper <hopper@omnifarious.org> [Fri, 18 Nov 2005 22:48:47 -0800] rev 1559
Convert all classes to new-style classes by deriving them from object.
Robin Farine <robin.farine@terminus.org> [Sun, 27 Nov 2005 16:37:18 +0100] rev 1558
fix run-tests' PYTHONPATH
Specify the installation directory for python modules so we can
set PYTHONPATH without guessing.