facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity
10,565 Commits 24 Branches 62 Tags 322 MiB
c82c9a473d
Commit Graph

643 Commits

Author SHA1 Message Date
Lee Cantey
4f90d32027 Default to 10.5 version using the default python 2.5 2007-12-10 14:54:41 -08:00
Steve Borho
957c67ad44 hgk: add black and blue as preferred colors 2007-12-10 12:16:59 -06:00
Steve Borho
90a5a885a9 win32: remove text man pages from Windows package 
The HTML versions are still packaged, and do not suffer from
eoln problems. This solves issue531 (addition through subtraction)
 2007-12-08 13:18:03 -06:00
Bryan O'Sullivan
58767a2b81 Merge with mpm 2007-12-07 21:46:08 -08:00
Steve Borho
2f5f0c75a9 win32: include zsh_completion in Windows package 2007-12-07 18:19:16 -06:00
Steve Borho
b092b562f9 win32: include contrib/vim in Windows package 2007-12-07 18:19:16 -06:00
Steve Borho
84bda28dba win32: use relative path to install source 
Remove hard-coded path to the source repo to be packaged.
 2007-12-07 18:19:16 -06:00
Steve Borho
a380954518 win32: move default install path inside program files 
All of the 'space in path' problems have been resolved, so
we can install Mercurial the Windows standard location.  The
{pf} InnoSetup variable is locale aware.
 2007-12-07 18:19:01 -06:00
Steve Borho
ae1da92108 win32: it is no longer necessary to bundle patch.exe 
Mercurial can use it's built-in mpatch library
 2007-12-07 18:18:11 -06:00
Matt Mackall
7d8a71a539 churn: avoid division by zero 2007-12-02 17:04:16 -06:00
Peter Arrenbrecht
bfb3ae9d06 Support qgoto in contrib/bash_completion. 2007-11-05 08:41:22 +01:00
bdowning@lavos.net
95bc1b9c93 hgk: change config file from .gitk to .hgk 
Git's gitk and Mercurial's hgk have diverged enough that their configuration information is no longer entirely compatible.  Whenever I run one, the other gets reset to the default screen position.  This patch changes hgk to store and read its configuration from ".hgk" instead of ".gitk", so as not to conflict with the "real" gitk anymore.
 2007-11-03 21:50:11 +01:00
Dustin Sallings
bebcdac954 Use both the from and to name in mdiff.unidiff. 
This fixes a compatibility issue with git diffs.
* * *
 2007-11-01 12:17:59 -07:00
NIIMI Satoshi
5043b722ca mq.el: define keymaps as convensions 2007-10-11 06:13:17 +09:00
NIIMI Satoshi
33f14d7efe mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs 2007-10-11 06:10:45 +09:00
NIIMI Satoshi
d6fe209c49 mq.el: declare variable mq-top 2007-10-11 06:01:30 +09:00
NIIMI Satoshi
471e00333a mercurial.el, mq.el: remove runtime dependencies on CL package 
* (require 'cl) at compile-time

* don't use map()
 2007-10-11 05:58:54 +09:00
Matt Mackall
99c5439b1a Add the new "droplet" logo 2008-02-14 10:25:24 -06:00
Thomas Arendsen Hein
3d8e3d2b46 merge with main 2008-02-14 00:13:20 +01:00
Maxim Dounin
ff250f0d9c hgweb: disable cgitb by default in hgwebdir.fcgi too 2008-02-13 05:27:04 +03:00
Steve Borho
a42f97b40e filemerge: add 'checkchanged' merge tool property 2008-02-06 20:32:06 -06:00
Matt Mackall
0e0a073578 mergetools: correct vim typo 2008-02-04 09:53:10 -06:00
Steve Borho
351fbe22a2 filemerge: two fixes for kdiff3 example configuration 2008-02-03 22:27:53 -06:00
Matt Mackall
176caad743 filemerge: add an example set of global settings for common merge tools 2008-02-03 19:29:05 -06:00
Matt Mackall
346758f77c merge: move the bulk of simplemerge into core 
- keep existing simplemerge command in contrib
- clean up test interface
 2008-02-03 19:29:05 -06:00
Georg.Koltermann@mscsoftware.com
0e65b396d5 hgk: colorize commits by authors 
Color commits by author. Colors will be assigned to authors by using a configurable list of colors. The line corresponding to current id (the version currently in the working tree) is highlighted in a special font which is also configurable. There is provision to assign fixed colors to authors. See .gitk comment for details.
 2007-04-12 13:11:30 +02:00
Christian Ebert
efbbc0df82 churn: simplify code to get terminal width 2007-09-12 12:54:36 +02:00
TK Soh
630bf5e215 hgk: allow any extdiff command for visual diff 2007-10-08 11:18:34 +08:00
Patrick Mezard
0e612978e0 hgk: add basic usage and configuration documentation 2007-10-05 23:40:33 +02:00
Patrick Mezard
8dbf0b280f hgk: add context menu visual diff action 
* * *
 2007-10-02 23:28:04 +02:00
Patrick Mezard
510efc6c01 hgk: add debug-config command to pass configuration options 2007-10-05 22:39:36 +02:00
Patrick Mezard
671b107790 hgk: fix right-mouse button handling under macosx 2007-10-02 23:28:02 +02:00
Bryan O'Sullivan
ecdd764817 convert: support darcs as a source repo 2007-10-02 13:49:11 -07:00
Bryan O'Sullivan
cf0914fc76 Merge with crew. 2007-09-29 20:55:36 -07:00
Brendan Cully
04f2479b21 Updated zsh completion from issue722. 2007-09-14 21:47:40 -07:00
Terry Smith
48df6ab798 darcs2hg: Added support for darcs tags. 2007-09-11 13:30:37 -04:00
Terry Smith
1189358bfb darcs2hg: Now detects and recovers from simple darcs conflicts. 2007-09-11 13:13:54 -04:00
Terry Smith
93e0edd2dc darcs2hg: Now understands files that were explicitly renamed in darcs. 2007-09-11 12:42:52 -04:00
Steve Borho
5a6d8a2860 hgk: add repo root to window title 2007-09-05 21:53:59 +02:00
Benoit Boissinot
6addb45a89 cgi: sys.path.insert should be before importing mercurial 
thanks to R. Burke
 2007-08-25 16:31:37 +02:00
Thomas Arendsen Hein
90d76a6ec9 Enable demandimport only in scripts, not in importable modules (issue605) 
This way other applications can choose if and when they want this feature,
because it might be problematic if those applications rely on ImportError.
 2007-08-18 11:37:08 +02:00
Thomas Arendsen Hein
3574aa1bb0 Adjust contrib/hg-ssh for moved dispatch() function. 2007-08-17 19:11:16 +02:00
Thomas Arendsen Hein
e34927453f Remove trailing spaces, fix indentation 2007-08-07 10:28:43 +02:00
Thomas Arendsen Hein
a799589be4 merge with crew-stable 2007-08-07 10:28:14 +02:00
Thomas Arendsen Hein
001b7980f8 Remove trailing spaces 2007-08-07 10:24:33 +02:00
Patrick Mezard
475f65528e hgk: enable mouse wheel under Windows. 
For some reason, MouseWheel events are not routed under windows even in latest ActiveTcl 8.4.15 while they are under linux and macosx. These events are activated using code supplied with Tcl Tip 171: <http://www.tcl.tk/cgi-bin/tct/tip/171.html>. Strangely, the Tip code almost work but generates some unexpected infinite loop which is fixed using a simple boolean to check reentrancy.
 2007-07-22 16:21:49 +02:00
Patrick Mezard
20a41666e1 hgk: enable mouse wheel on MouseWheel events. 
At this point, mouse wheel still does not work under Windows.
 2007-07-22 16:21:49 +02:00
Christian Ebert
614aa178a1 churn: get current terminal width if possible 2007-07-19 18:39:51 +02:00
jon.christopher@Rigaku.com
db9543cd23 Re: mercurial.el and hg-version-other-window 
hg-version-other window is unimplemented in mercurial.el.  The version
below works for me, YMMV.
 2007-07-14 11:27:58 -05:00
Thomas Arendsen Hein
e7f3af8440 merge with crew-stable 2007-07-06 08:55:36 +02:00
Lee Cantey
b7b57a0fbc Add html docs and use for help shortcut 2007-07-05 15:40:29 -07:00
Lee Cantey
d44c55c0f5 Remove specific version requirement and point to latest versions of Mac Python downloads. 2007-07-03 04:18:24 -07:00
Thomas Arendsen Hein
ab2d8805b8 Merge with crew-stable 2007-07-01 19:19:42 +02:00
Thomas Arendsen Hein
34b7fe0900 Make hgk handle filenames with spaces (issue49) 2007-07-01 19:15:25 +02:00
Thomas Arendsen Hein
03bf1f420d Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. 
tcl's exec yields an error if output to stderr happens and isn't redirected to
a file, so the warnings about untrusted .hg/hgrc caused problems in hgk.
The warning is still printed when executing 'hg view', so the user can see it
when using it from the shell.
 2007-07-01 15:22:49 +02:00
Brendan Cully
f1750b4537 Merge with Adam Spiers 2007-06-30 08:31:23 -07:00
Adam Spiers
53cdf9de29 mercurial.spec: convert extension now installs files into hgext/convert/ 2007-06-30 01:21:41 +01:00
Adam Spiers
628e7b3fec buildrpm: fix rpm release number calculation 
It was broken when patch queues were in use.
 2007-06-30 01:21:41 +01:00
Lee Cantey
bcfa3d34a8 Convert default mercurial.ini file to Windows line endings 2007-06-29 13:06:49 -07:00
Bryan O'Sullivan
753061d492 Update binary installer files. 2007-06-25 16:35:27 -07:00
Adam Spiers
84fdb1c81b buildrpm: auto-generate %changelog in .spec file 
Top entry is tip; subsequent entries are the version tags from .hgtags.
 2007-06-03 14:42:39 +01:00
Adam Spiers
befe0e3cb2 mercurial.spec: include CONTRIBUTORS, COPYING and man pages in rpm 2007-06-30 01:21:22 +01:00
Adam Spiers
34346718e5 mercurial.spec: include various utility files from contrib/ in rpm 
Files included:
hgk
convert-repo
hg-ssh
hg-viz
git-rev-tree
bash_completion
zsh_completion
mercurial.el
 2007-06-03 14:40:56 +01:00
NIIMI Satoshi
ad08d10949 mercurial.el: ignore errors on hg-after-save-hook() 
Don't signal an error even if running hg command fails.  Otherwise,
succeeding hooks won't be called.
 2007-05-22 07:24:06 +09:00
NIIMI Satoshi
2d751dee3c mercurial.el: change default log range to tip:0 
If the tip revision is smaller than hg-rev-completion-limit (defaults
to 100), "hg log -r tip:-100" fails.

Since performance does not differ between "hg log -l 50 -r tip:0" and
"hg log -l 50 -r tip:-100" even on large repository, default range can
be changed from "tip:-100" to "tip:0" without any drawbacks.
 2007-05-22 08:05:16 +09:00
Thomas Arendsen Hein
9270e4454c hgk: Use $HG instead of hg (see 9779a8c8d672) 2007-06-23 21:10:55 +02:00
Thomas Arendsen Hein
4d29c6dc8e Updated copyright notices and add "and others" to "hg version" 2007-06-19 08:51:34 +02:00
Lee Cantey
dd5e7d8612 Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer. 
Initial version from Shun-ichi GOTO in BTS 449 for private copies of DLLs.
Additional changes to remove local DLL flag on uninstall and set privilege level.
 2007-06-18 15:21:02 -07:00
Edouard Gomez
dbf0694f1f Add a wrapper script for convert extension 2007-05-25 08:12:33 +02:00
Thomas Arendsen Hein
ae50302e53 Move convert-repo to hgext/convert/__init__.py 2007-06-06 19:49:47 +02:00
Patrick Mezard
fe805595f1 Merge with crew-stable 2007-06-04 22:56:42 +02:00
TK Soh
490bbff9dc hgk: display tags that contain spaces 2007-06-04 09:16:53 -05:00
Bela Babik
6a77eec575 hgk: added -selectbackground grey to canvases 2007-06-04 16:54:52 +10:00
Patrick Mezard
1391770d5b Merge with crew-stable. 2007-05-20 19:32:22 +02:00
Henri Precheur
0b652b63b3 Fix issue 563: error in _hg_commit in the contrib/zsh_completion script. 2007-05-20 19:27:14 +02:00
Daniel Holth
caa7c2ca50 use documented convert-repo interface 2007-05-16 01:10:12 -04:00
Daniel Holth
cb3cbd5fa8 document conversion interface 2007-05-16 01:07:27 -04:00
Bryan O'Sullivan
5313e5fea5 mq.el: add mq-signoff, to sign off on a patch 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
411ed17e0f mq.el: don't fill half the screen with a single line of output. 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
1baae2927b mq.el: add hook to run when finishing the edit of a patch. 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
164a276c57 imported patch mq-refresh-git.patch 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
a5fde1040c mq.el: allow mq-diff to take a git option. 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
a0bf3a7986 mq.el: add mq-diff function. 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
6de2e55e8c mq.el: add mq-edit-series function. 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
5b6367c912 mq.el: add mq-new function. 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
058a5fb7b0 contrib/hgsh: Check for .hg/store as well as .hg/data. 
This is required by the new repository layout.
 2007-05-08 11:51:25 -07:00
NIIMI Satoshi
1c67345a13 mercurial.el: fix error on hg-read-rev() with small tip, and cleanups 
* Fix error if tip revision is smaller than hg-rev-completion-limit

  If tip revision is 10, "hg log -r -100:tip" fails.

* Remove dependencies on cl package at runtime

  Quote from GNU Emacs Lisp Reference Manual, Emacs Lisp Coding Conventions:
  > * Please don't require the `cl' package of Common Lisp extensions at
  >   run time.  Use of this package is optional, and it is not part of
  >   the standard Emacs namespace.  If your package loads `cl' at run
  >   time, that could cause name clashes for users who don't use that
  >   package.

* Check XEmacs at compile time

  Since byte-compiled file is not portable between GNU Emacs and
  XEmacs, checking type of emacs can be done at compile time.  This
  reduces byte-compiler warnings.

* Defvar variables binded dynamically and used across functions

* Combine status output string to state symbol alist into a variable,
  and use char instead of string for key of state alist

* Make hg-view-mode as minor-mode

* Define keymaps as conventions
 2007-05-07 21:44:11 +09:00
Brendan Cully
6fae8c6b65 Fix test-patchbomb for crew 2007-05-08 13:08:20 -07:00
NIIMI Satoshi
30fab1e0c5 mercurial.el: don't raise an error from find-file-hook 
find-file() shouldn't fail even if unreadable .hg directory is exists.
Not enabling hg-mode is sufficient for that senario.
 2007-05-05 15:56:49 +09:00
NIIMI Satoshi
819c1ff3d3 mercurial.el: move defmacro of hg-do-across-repo before use 
Macros must be defined before use to be byte-compiled properly.
 2007-05-05 15:50:40 +09:00
Brendan Cully
15abedecdd Unconfuse font-lock 2007-05-07 08:42:48 -07:00
Patrick Mezard
2b6cc17dd7 simplemerge: flush stdout before writing to stderr. 
Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.
 2007-05-06 16:40:53 +02:00
Matt Mackall
5290628c48 Merge with stable 2007-05-03 17:27:21 -05:00
Lee Cantey
a02d3ae073 Update Windows build instructions. 2007-05-03 14:09:09 -07:00
Michael Gebetsroither
dd5ee4047c Add hgwebdir.fcgi to contrib 2007-04-29 18:17:35 -07:00
Lee Cantey
524f7a0cf1 Add notes about configuring a merge program 2007-04-26 23:58:18 -07:00
Lee Cantey
3fd9fb852e Update copyright year and change to range 2007-04-27 16:04:17 -07:00
Alexis S. L. Carvalho
2fe1ec9254 polish the simplemerge command; add a test 2007-04-16 20:17:39 -03:00
Alexis S. L. Carvalho
f65315991b actually port simplemerge to hg 
- use bdiff instead of patiencediff;  this is a larger change, since
  bdiff works on 2 multi-line strings, while patiencediff works on 2
  lists;

- rename the main class from Merge3 to Merge3Text and add a Merge3
  class that derives from Merge3Text.  This new Merge3 class has
  the same interface from the original class, so that the tests
  still work;

  - Merge3 uses util.binary to detect binary data and raises
    util.Abort instead of a specific exception;

- don't use the @decorator syntax, to keep python2.3 compatibility;

- the test uses unittest, which likes to print how long it took to
  run.  This obviously doesn't play too well with hg's test suite,
  so we override time.time to fool unittest;

- one test has a different (but still valid) output because of the
  different diff algorithm used;

- the TestCase class used by bzr has some extras to help debugging.
  test-merge3.py used 2 of them:

  - log method to log some data

  - assertEqualDiff method to ease viewing diffs of diffs

  We add a dummy log method and use regular assertEquals instead of
  assertEqualDiff.

- make simplemerge executable and add "#!/usr/bin/env python" header
 2007-04-16 20:17:39 -03:00
Alexis S. L. Carvalho
50315bfe3b Import 3-way merge code from bzr 
merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py
 2007-04-16 20:17:39 -03:00
Joel Rosdahl
cd9e37bddc Add graphlog extension 2007-04-09 10:39:28 +02:00
Emanuele Aina
c4577db686 Move back the purge extension in hgext 2007-02-27 09:05:36 +01:00
Emanuele Aina
eb67de0025 purge: abort with missing files avoiding problems with name-mangling fs 
In a name mangling filesystem (e.g. a case insensitive one)
dirstate.walk() can yield filenames different from the ones
stored in the dirstate. This already confuses the status and
add commands, but with purge this may cause data loss.

To prevent this purge refuses to work if there are missing
files and has a 'force' option if the user knows it is safe.

Even with the force option purge checks if any of the missing
files is still available in the working dir: if so there
may be some problem with the underlying filesystem, so it
unconditionally aborts.
 2007-03-28 21:34:12 +02:00
julian@lava.net
a4f900945a mercurial.spec: add BuildRequires 
Add build dependencies from README as block quote.
 2007-01-21 00:59:23 -10:00
Adam Spiers
3aa5e87b5f mercurial.spec: fix when default python prefix != rpm %{_prefix} 
e.g. on SUSE Linux Enterprise 10
 2007-06-02 12:42:47 +01:00
Brendan Cully
d2aebd5874 hg-relink: do not compare .d files 2007-03-23 14:11:31 -07:00
Brendan Cully
294e96e41d Add hg-relink script to contrib 2007-03-19 09:36:06 -07:00
Alexis S. L. Carvalho
d879f85126 purge.py: fix invocation of statwalk 2007-03-06 17:45:50 -03:00
Emanuele Aina
5d9baefa2d Delete the README for purge, putting the useful informations in comments 2007-02-27 09:05:36 +01:00
Emanuele Aina
ee25137c54 Delete the Purge class, refactoring Purge.purge() in dopurge() 2007-03-06 17:45:47 -03:00
Emanuele Aina
9919c4cec9 Do not use 'self' in the purge() method 
Avoid any reference to 'self' in Purge.purge() to allow its refactoring
in a simple function.
 2007-03-06 17:45:46 -03:00
Emanuele Aina
444be74447 Use nested functions instead of object methods 2007-03-06 17:45:45 -03:00
Emanuele Aina
add604f550 Merge _remove_file() and _remove_dir() in a single function 2007-03-06 17:45:44 -03:00
Emanuele Aina
0784333e9d Use "f in dirstate" instead of "dirstate.state(f) == '?'" 2007-03-06 17:45:43 -03:00
Emanuele Aina
40ec111680 Reduce the absolute/relative path conversion in the purge extension 2007-03-06 17:45:41 -03:00
Emanuele Aina
0eba8ea662 Make the purge extension use the statwalk walker from the dirstate object 2007-03-06 17:45:40 -03:00
Emanuele Aina
7f4113f4c9 Use the mercurial i18n infrastructure in the purge extension 2007-02-27 09:05:36 +01:00
Emanuele Aina
253ba3cb60 Print relative names in the purge extension 2007-02-27 09:05:36 +01:00
Matt Mackall
fa7f84e558 Merge with crew 2007-02-26 12:12:29 -06:00
Matt Mackall
7389517c51 convert-repo: use .git/objects/ rather than .git/HEAD to detect git repos 2007-02-21 11:02:37 -06:00
Edouard Gomez
b5865c4bee Don't keep trailing white space in cvs tags 2007-02-21 00:38:06 +01:00
Edouard Gomez
3dca428e7f Change a bit cvsps arguments 
- Force updating the cache
- Use internal cvs implementation, reducing overhead
- Use quiet mode
 2007-02-21 00:38:06 +01:00
Daniel Holth
4d3ca846b4 convert-repo converts symlinks from git 2007-01-30 23:09:06 -05:00
Alexis S. L. Carvalho
7af591a53b convert-repo: handle packed git tags 2007-02-06 15:23:40 -02:00
csaba.henk@creo.hu
8af40de48e add pserver support to convert_repo 2007-01-27 15:53:31 -08:00
Matt Mackall
9a533e02cb symlinks: add flags param to wwrite 
Now wwrite can set symlink and exec for files
 2006-12-29 20:04:31 -06:00
Thomas Arendsen Hein
2cdb545f39 expanded bash_completion for transplant extension 2006-12-26 20:08:09 +01:00
Thomas Arendsen Hein
18cb6f7087 Yield entries from [paths], too, when completing -R/--repository. 2006-12-26 19:56:42 +01:00
Benoit Boissinot
cd66ae056f remove various unused import 2006-12-25 13:37:00 +01:00
Matt Mackall
8cff52fcff convert-repo: add option to attempt to sort by date 2006-12-22 17:59:40 -06:00
Matt Mackall
817a588598 convert-repo: add CVS exec bit support 2006-12-22 17:59:39 -06:00
Matt Mackall
75feb7bb1b convert-repo: add CVS branch support 2006-12-22 17:59:34 -06:00
Matt Mackall
ba8b6e6edb convert-repo: add basic CVS import support 2006-12-22 17:59:34 -06:00
Matt Mackall
a77f4328cc Merge with crew 2006-12-21 23:17:20 -06:00
Matt Mackall
09da67d940 Update convert-repo usage comments 2006-12-20 17:04:07 -06:00
Matt Mackall
deba2e1002 convert-repo: add some smarts 
autodetect source and destination repo types
autodetect read and write capabilities of converters
default destination directory (<src>-hg)
default map file (<dest>/.hg/shamap)
more verbose by default
add a -q switch

add IO functions
 2006-12-20 16:31:46 -06:00
Brendan Cully
bebaecb5c7 Merge with crew-stable 2006-12-20 12:05:12 -08:00
Thomas Arendsen Hein
bdd9bc9c2e sample.hgrc: hgk extension is now in hgext. Use churn as example for contrib. 2006-12-19 15:46:02 +01:00
Thomas Arendsen Hein
6cdaa1eb33 purge extension doesn't need "#!/usr/bin/env python". 
(from the Debian package: deb_specific__hgpurge.py.patch)
 2006-12-19 15:37:10 +01:00
Thomas Arendsen Hein
f2c2df1ab1 merge with crew-stable 2006-12-16 23:36:06 +01:00
Alexis S. L. Carvalho
437bbbf008 convert-repo: update usage information 2006-12-16 20:18:36 -02:00
Matt Mackall
5b91081b08 convert-repo: avoid adding bogus value to shamap on tag update 2006-12-16 14:41:34 -06:00
Matt Mackall
013499cdd5 convert-repo: fix recoding of committer 2006-12-16 14:35:14 -06:00
Andrei Vermel ext:(%22)
67fecf2874 hgk - fix CR issues on windows 2006-12-15 10:32:57 +03:00
Andrei Vermel ext:(%22)
bb3977beb8 hgk - fix CR issues on windows 2006-12-15 10:32:57 +03:00
Brendan Cully
19123a0330 Merge with main 2006-12-14 13:49:33 -08:00
Matt Mackall
f17a4e1934 Replace demandload with new demandimport 2006-12-13 13:27:09 -06:00
Steve Borho
8cbd4afec6 zsh: better fix for partial completions 
Properly handle relative paths followed by partial filenames
hg add ../path/to/file/partial[TAB]
 2006-12-12 15:34:11 -06:00
Matt Mackall
e138593173 Remove hard-coded version numbers and release notes from packaging 2006-12-10 17:41:07 -06:00
Matt Mackall
c5d95b8fdf Teach convert-repo to deal with mixed charsets in git 2006-12-07 18:03:28 -06:00
Steve Borho
d806171a31 zsh: fix completions with relative paths 
hg add ../foo/bar[TAB] now does what you expect
 2006-12-05 21:35:44 -06:00
Steve Borho
15166b0318 zsh: remove deprecated -f option for hg update 2006-12-05 21:30:04 -06:00
Edouard Gomez
1ff2fa835a Fix revrange() call in the churn contrib 2006-12-05 14:58:32 +01:00
Benoit Boissinot
cf739ae9f7 update rewrite-log for tip ; chmod it 2006-11-26 13:28:30 +01:00
Thomas Arendsen Hein
411d64ce3e white space and line break cleanups 2006-11-17 08:06:54 +01:00
Brendan Cully
4a565c90ea zsh: typo in commit completion 2006-11-09 14:44:17 -08:00
Lee Cantey
b20ea2c6c5 Remove references to documentation that was removed in 24418108a60e 2006-11-06 22:01:09 -08:00
Brendan Cully
b15461036c zsh: perform ~ expansion on _hg_root 2006-10-31 17:31:30 -08:00
Brendan Cully
7f54c1d0b4 zsh: compute repository root instead of forking hg 2006-10-31 16:35:44 -08:00
Brendan Cully
9da5f91c89 zsh: complete users in ssh URLS 2006-10-31 16:04:03 -08:00
Brendan Cully
cd778eadd0 zsh: support remote cloning 2006-10-31 15:48:02 -08:00
Brendan Cully
9bbafade7a zsh: add optional remote directory cache 2006-10-31 15:44:16 -08:00
Brendan Cully
3119807ae3 zsh: complete SSH directories 2006-10-31 14:53:08 -08:00
Brendan Cully
131b2b2643 zsh: complete unknown commands normally 2006-10-31 12:05:47 -08:00
Brendan Cully
2e3c2f2949 zsh: tab-complete status results by directory 
Filter diff and revert for modified files only, unless -r is given.
 2006-10-30 00:03:04 -08:00
Brendan Cully
3606bc94d5 zsh: support remote URLs 2006-10-26 22:28:33 -07:00
Brendan Cully
01eda2914c zsh: suppress mq completion error messages outside of repository 2006-10-26 17:33:24 -07:00
Brendan Cully
726d081e93 zsh: suppress error message for status completion outside of repository 2006-10-26 17:28:12 -07:00
Brendan Cully
dccb39e75b zsh: add revrange completion 2006-10-26 10:06:12 -07:00
Brendan Cully
ab95045857 zsh: add qbase and qtip to qapplied completions 2006-10-26 09:46:08 -07:00
Brendan Cully
ddd5d9ba9a zsh: use standard tags where possible 2006-10-26 09:44:03 -07:00
Christian Ebert
bc36260e88 hgcommand.vim: doc install delete into "black hole", g: prefix global vars. 2006-10-25 20:59:50 +02:00
Brendan Cully
f1af57026d zsh: complete qguard with +/- guard prefixes 2006-10-26 00:27:19 -07:00
Christian Ebert
0d894a5f6b hgcommand.vim: remove deprecated -b option from hg parents. 2006-10-25 21:01:00 +02:00
Brendan Cully
a134cc7992 zsh: complete qapplied, qdiff, qfold, qguard, qimport, qnext, qprev 
as well as qrename, qselect, qseries, qunapplied and qtop.
 2006-10-25 19:31:42 -07:00
Brendan Cully
bb5f04c914 zsh: make option lists more compact 2006-10-25 16:35:35 -07:00
Brendan Cully
e66d4aa097 Merge with mpm 2006-10-25 15:10:30 -07:00
Brendan Cully
9a335986e3 zsh: rewrite 
This version of zsh completion handles global options more correctly,
completes options for command abbreviations, and does much more lazy
evaluation.
 2006-10-25 15:08:40 -07:00
Matt Mackall
abfc922591 Move rewrite-log to contrib 2006-10-25 16:24:28 -05:00
Brendan Cully
d5642c0e24 zsh: cache hg help output 2006-10-24 13:17:41 -07:00
Brendan Cully
504cbef404 zsh: complete according to the -R option if specified 2006-10-24 13:09:09 -07:00
Brendan Cully
4a3b3e604f zsh: add view opts 2006-10-24 11:10:04 -07:00
Brendan Cully
3e299a69c3 zsh: add --style and --template opts 2006-10-24 11:10:04 -07:00
Brendan Cully
b9f1be38a3 zsh: add -r to parents 2006-10-24 11:10:04 -07:00
Brendan Cully
6a1169bc1f zsh: expand tags lazily 2006-10-24 11:10:04 -07:00
Brendan Cully
4bf36aa43c zsh completion: basic mq support 2006-10-21 23:51:36 -07:00
Alexis S. L. Carvalho
e9f8074f12 bash_completion: qguard 2006-10-22 01:02:13 -03:00
Alexis S. L. Carvalho
6494ab9d9d bash_completion: allow overriding completion for arguments that start with "-" 2006-10-22 01:02:06 -03:00
Alexis S. L. Carvalho
48503f4580 bash_completion: qfold, qrename, qheader, qclone and qselect 2006-10-22 01:02:00 -03:00
Alexis S. L. Carvalho
8ae844fff4 bash_completion: email --bcc 2006-10-22 01:01:52 -03:00
Alexis S. L. Carvalho
648f8acf27 bash_completion: qdelete --rev 2006-10-22 01:01:45 -03:00
Alexis S. L. Carvalho
f8066a6345 bash_completion: make export fall back to tags when there's no mq patch applied 2006-10-22 01:01:42 -03:00
Alexis S. L. Carvalho
e6c66d1351 bash_completion: don't complete export with "garbage" when mq is not around 
The "garbage" is the output of hg help printed when a command is not found.
 2006-10-22 01:01:03 -03:00
Lee Cantey
9d4f5c9635 Default editor for Windows installer is now notepad. [Issue 256] 2006-10-17 11:01:10 -07:00
Lee Cantey
84c0065bf8 Document the change in MacPython distutils installation location 2006-10-17 10:21:54 -07:00
Thomas Arendsen Hein
3c5c8567e6 Fixed contrib/hgdiff script to pass diffopts in the new format. 2006-10-15 20:56:38 +02:00
Brendan Cully
af319dc101 mq.el: add mode-line hook 2006-10-12 12:15:56 -07:00
Thomas Arendsen Hein
0a7b982aa6 Whitespace/Tab cleanup 2006-10-01 19:26:33 +02:00
Benoit Boissinot
3b788ed358 merge with brendan 2006-09-15 00:51:27 +02:00
Brendan Cully
24756bd157 Move revision parsing into cmdutil. 2006-09-14 11:19:35 -07:00
Brendan Cully
7bcd472f27 hgk: add --limit, and revranges 2006-09-13 18:24:58 -07:00
Brendan Cully
8be3ac699a hgk: add revision numbers 2006-09-13 13:50:28 -07:00
Benoit Boissinot
eae4c3f154 merge crew with hg-churn 2006-09-05 11:33:47 +02:00
Shun-ichi GOTO
73dd303066 Fix for Python 2.3 compatibility. 
Note: Name of comparing function of sort() is "cmpfunc" in Python 2.3
and "cmp" in Python 2.4.
 2006-09-05 12:40:45 +09:00
Josef "Jeff" Sipek
a3e9372532 [churn] Moved churn extension from hgext to contrib 2006-09-04 16:02:25 -04:00
TK Soh
653bca13b7 hgk: use short changeset hashes 
this fixes the missing tags on hgk window
 2006-08-24 16:12:23 -05:00
Benoit Boissinot
9fdf0e7e23 merge with hg-churn 2006-09-04 23:27:14 +02:00
Giorgos Keramidas
95ed16f229 Use cached hg-root-dir instead of rediscovering 
by a second call to (hg-root).  We have the path
we need already as the value of hg-root-dir.
 2006-08-13 20:21:13 +03:00
Christian Ebert
e16085a325 hgcommand.vim: requirements & doc self-install more consistent; cosmetics 
Check for availability of builtin system().
Set 'compatible' while sourcing script.
File operation during doc self-install:
Escape spaces in ex-commands.
Use quotes in system calls.

Incremented revision number(s).

Size of patch is due to cosmetic cleanups:
Removal of spaces at line endings.
<SID>Prefix to functions when called.
 2006-08-02 00:20:28 +02:00
Sébastien Pierre
ed658dff2d [darcs2hg] Windows compatibilty patct 
Originally submitted by Daiju Kito
 1. single quote didn't work in several cases
 2. os.unlink tries to delete tmpfile when it's called. It won't wait like unix.
 2006-08-01 09:51:36 -04:00
Giorgos Keramidas
1f91b78691 avoid calling (cd ...) with `nil' as a directory name 
When (hg-root) cannot determine the current Mercurial root, print an
error message instead of trying to evaluate (cd nil).
 2006-07-30 09:37:08 +03:00
Christian Ebert
5ab6440f56 hgcommand.vim: cleanup of doc self-install code 2006-07-29 01:58:12 +02:00
Bryan O'Sullivan
f820deb822 mq.el: Add comment to mq-edit-finish. 2006-08-22 17:01:24 -07:00
Bryan O'Sullivan
ddd87b1304 mq.el: add ability to edit a patch. 2006-08-22 16:59:22 -07:00
Bryan O'Sullivan
c1a8703aae Emacs: add mq.el, early support for Mercurial Queues. 2006-08-22 16:04:58 -07:00
Bryan O'Sullivan
e55bd65d54 mercurial.el: deal with more vagaries of "hg status". 
If we run "hg status" on a file that does not exist, it prints an error
message.  Attempt to extract the name of the file.
 2006-08-22 15:15:52 -07:00
Bryan O'Sullivan
01df2e50e5 mercurial.el: add hg-cwd 2006-08-22 14:03:10 -07:00
Bryan O'Sullivan
9447cded78 mercurial.el: speed up mode line updates. 2006-08-22 14:02:43 -07:00
Bryan O'Sullivan
154114b444 mercurial.el: add hg-status. 2006-08-22 11:37:18 -07:00
Bryan O'Sullivan
4d1786ec1f mercurial.el: use parents in modeline, not tip 2006-08-22 11:36:58 -07:00
Bryan O'Sullivan
c4a476da55 mercurial.el: fix hg-chomp. 2006-08-22 11:24:59 -07:00
Bryan O'Sullivan
0127d671dc mercurial.el: fix calls to goto-char. 2006-08-22 08:54:19 -07:00
Bryan O'Sullivan
093b29e224 mercurial.el: get rid of unportable, unperformant use of replace-regexp. 2006-08-22 08:53:37 -07:00
Mathieu Clabaut ext:(%22)
465e0ef538 Improve bash_completion for patches in MQ 2006-07-26 20:15:31 +02:00
Lee Cantey
a913e9fd83 Update Windows and Mac installers to 0.9.1 release 2006-07-25 17:15:44 -07:00
FUJIWARA Katsunori
feed3e771b Emacs: apply "expand-filename" on "default-directory". 
"default-directory" may has home directory("~") relative path in some
runtime environment(or emacs revision ?), so expand-filename is
required.
 2006-07-22 23:35:16 +09:00
FUJIWARA Katsunori
73f0f2e2ee Emacs: apply kill-local-variable instead of make-local-variable to FORGET 2006-07-22 23:30:19 +09:00
Alexis S. L. Carvalho
d936b8286b make convert-repo deal with git symbolic refs. 
Problem noticed by Sébastien Pierre
 2006-07-24 13:47:29 -07:00
Mathieu Clabaut ext:(%22)
a37037fb18 HGcommand.vim : the status was read for the wrong file as we changed the current directory before 2006-07-19 09:28:59 +02:00
Mathieu Clabaut ext:(%22)
ecaae60190 Do not try to get revision and branch information for file which are not tracked 2006-07-18 18:35:47 +02:00
Mathieu Clabaut ext:(%22)
7717e8ded9 Correction of commit with a log message in a file 2006-07-18 18:35:47 +02:00
Mathieu Clabaut ext:(%22)
b092ebbad7 Test if file is below an HG root before doing anything 2006-07-18 18:35:47 +02:00
Rafael Villar Burke
92d2c1c1b7 contrib: add sample.hgrc 2006-07-14 22:38:21 -07:00
Vadim Gelfer
40666b2d59 merge with mathieu clabaut. 2006-07-12 15:47:12 -07:00
Vadim Gelfer
1ff90c4c47 contrib/hgsh: make to work with remote clone over ssh. 2006-07-12 15:44:51 -07:00
Mathieu Clabaut ext:(%22)
5d30b8769c HGcommand.vim : HGCommandEnableBufferSetup on by default 2006-07-13 00:02:26 +02:00
Mathieu Clabaut ext:(%22)
1a1ab9fc77 HGcommand.vim : HGGetStatusLine accept to display an empty 'branch' value 2006-07-12 23:52:13 +02:00
Mathieu Clabaut ext:(%22)
466ef383a7 HGcommand.vim : suppress CVS relief 2006-07-12 23:52:13 +02:00
Mathieu Clabaut ext:(%22)
ec047764fb HGcommand.vim : doc review. 2006-07-12 23:52:08 +02:00
Mathieu Clabaut ext:(%22)
be0be5d475 HGcommand.vim : doc integration 2006-07-12 23:50:34 +02:00
Vadim Gelfer
0923c5c205 merge with crew. 2006-07-11 13:47:51 -07:00
Mathieu Clabaut ext:(%22)
7d1dd836ba Vim script: Adaptation from CVS to Mercurial 2006-07-10 23:45:16 +02:00
Mathieu Clabaut ext:(%22)
2958e5cbf3 Addition of CVScommand vim script as a base for HGcommand 2006-07-10 23:39:08 +02:00
Sébastien Pierre
27d193fe81 darcs2hg: pause and resume support, date extraction from commit hash, does not break on empty commits 2006-07-10 12:19:37 -04:00
Nils Decker
7b2bc09d74 darcs2hg.py: use darcs patch hash as patch identifier 
The use of the patch name is dangerous when duplicate names exist.
In case of a duplicate name the second patch and all its dependancies
are merged into a single mercurial patch.
The patch identifier (hash) is always unique.
 2006-07-09 21:41:00 -07:00
Lee Cantey
169c49677d Redirect MacPython link to point to python.org 2006-07-06 09:26:31 -07:00
Raphael Marmier
4d2b4ac19a Disable automatic line endings conversion on windows 
The rationale behind this is that such conversion implies a particular
situation in which all files in the repo are terminated by only LF. This
is documented nowhere and it bit me sharply when I upgraded.

Furthermore, it works on the assumption that a file containing no NULL
characters are actually a text file. Therefore it cannot guarantee that
no binary file will be harmed in the process.

Currently, if a file already contains CRLF line endings when it is
copied to the working dir from the repo, then the version in the working
dir will be corrupted by an extra CR.

I'm working on a patch that will turn this into a warning. But as a side
effect, committing such a file back will strip it from its CR.

In all case, unrequested data modification can occur under the feet of
the user, which is bad(tm), ihmo.
 2006-07-03 10:18:46 -07:00
Vadim Gelfer
82a6d82061 mercurial.el: fix misleading indent of code. 
code was correct, indent was wrong.
 2006-06-29 10:35:15 -07:00
Vadim Gelfer
ad8c158ca2 mercurial.el: inhibit backups for files managed by mercurial 2006-06-29 10:27:09 -07:00
Lee Cantey
14693b5695 Update Mac OSX installer to 0.9 with Universal Python build 2006-06-27 11:32:37 -07:00