Commit Graph

395 Commits

Author SHA1 Message Date
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