lp:vc-bzr

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

26. By Riccardo Murri on 2008-01-04

Merge from `emacs22.1` branch.

25. By Riccardo Murri on 2008-01-03

Support new VC fileset functionality, plus a few bug fixes.

* (vc-bzr-log-switches): New customization option.
* (vc-bzr-command): No longer use `vc-bzr-program-args'
* (vc-bzr-revision-granularity): New function.
* (vc-bzr-state): Support new 'removed, 'ignored, and 'unregistered states.
* (vc-bzr-init-revision): Renamed from `vc-bzr-init-version'
* (vc-bzr-unregister): BUGFIX: Must not delete file.
* (vc-bzr-find-revision): New function.
* (vc-bzr-checkout): Argument `rev' is explicit revision only if it's
  a non-empty string, otherwise take head revision.
* (vc-bzr-print-log): Pass `vc-bzr-log-switches' to "bzr log"
* (vc-bzr-diff): Simpler build of the revision spec string.
* (vc-bzr-dir-state): Added code comments. Removed redundant statement.
* (vc-bzr-dired-state-info): Only provide custom strings for
  overloaded VC state ''edited; otherwise fallback to
  `vc-default-dired-state-info'.

24. By Riccardo Murri on 2008-01-03

Pull from Emacs CVS:

  revision 1.23
  date: 2007-12-29 14:20:48 +0100; author: esr; state: Exp; lines: +1 -1; commitid: iOiPYR0Ye3bepkLs;
  [...]
  * vc-bzr.el (vc-bzr-dir-state): Recognize 'added.
  ----------------------------
  revision 1.22
  date: 2007-12-28 19:16:55 +0100; author: esr; state: Exp; lines: +5 -2; commitid: fV8r6nSDz7BN4eLs;
  [...]
          * vc-bzr.el (vc-bzr-dir-state): Set 'ignored and
          'unregistered' when appropriate.
  ----------------------------
  revision 1.21
  date: 2007-12-28 09:59:49 +0100; author: esr; state: Exp; lines: +1 -0; commitid: E5R5WPcK1cIGZaLs;
  * vc-bzr.el, vc-cvs.el, vc-git.el, vc-hg.el, vc-mcvs.el, vc-svn.el:
  Modify all instances of the dir-state back-end method to suppress
  keeping undo lists on the buffers holding astatus output, which
  csn get extremely large.
  ----------------------------
  revision 1.20
  date: 2007-12-27 00:24:08 +0100; author: esr; state: Exp; lines: +2 -2; commitid: 7PPDglKW0rsbQZKs;
  *** empty log message ***
  ----------------------------
  revision 1.19
  date: 2007-10-20 03:28:35 +0200; author: monnier; state: Exp; lines: +0 -1; commitid: GXJUAapveRMoIgCs;
  * vc-bzr.el (vc-bzr-diff-tree): Remove.
  [...]
  ----------------------------
  revision 1.18
  date: 2007-10-10 21:39:22 +0200; author: esr; state: Exp; lines: +9 -9; commitid: YoQWz0zQnt1f45Bs;
  Carry through today's big terminology change to a few places where I
  missed it in the back ends.
  ----------------------------
  revision 1.17
  date: 2007-10-10 20:52:44 +0200; author: esr; state: Exp; lines: +3 -3; commitid: DeTrcwI9HP2rO4Bs;
  Terminology cleanup.

23. By Riccardo Murri on 2008-01-03

* Removed outdated comments.
* (vc-bzr-program-args): Removed because unused.
* (vc-bzr-command): Use "LC_MESSAGES=C" instead of "LC_ALL=C".
* (vc-bzr-status): Removed redundant test.
* (vc-annotate-convert-time, vc-bzr-annotate-difference): Removed:
  compatibility hacks for Emacs21, not needed in Emacs 22.

22. By Riccardo Murri on 2008-01-03

* (vc-bzr-register): Fix for working with both 22.1 and CVS version of
  `vc-find-root' (patch by Andreas Hoenen)
* (vc-bzr-status): Update regex to match latest Bzr output.
* (vc-bzr-init-version): New function.
* (vc-bzr-checkout): Undo last commit: `rev' required to be nil
* (vc-bzr-merge-news): Undo last commit: removed. Will get its own
  branch on launchpad.net/vc-bzr until it's ready for mainstream.
* Added Emacs 22.1 init commands to commentary section.

21. By Riccardo Murri on 2007-10-04

(vc-bzr-do-command): Updated docstring.
(vc-bzr-checkout): Consider rev="" as rev=nil.
(vc-bzr-merge-news): New function. Drafted in attempt to fix
  Launchpad.net' bug 148877; needs more testing.

20. By Riccardo Murri on 2007-10-04

Sync with Emacs CVS vc-bzr.el revision 1.11.2.9:

  (vc-bzr-workfile-version): Use `expand-file-name' instead of `concat'.

19. By Riccardo Murri on 2007-09-06

Correct handling of Bzr Branch format 6 repos.
Closes Launchpad.net [Bug 137693]

* (vc-bzr-admin-lastrev): New constant
* (vc-bzr-workfile-version): Use correct path to 'last-revision' file.
  Use `file-name-as-directory' for future portability.

18. By Riccardo Murri on 2007-09-05

* (vc-bzr-status): Correct wrong parentheses.

17. By Riccardo Murri on 2007-09-05

* Bump "Version:" header
* (vc-bzr-file-name-relative): Use 'when' instead of 'and'.
* (vc-bzr-status): Fix shadowing of variable 'status'.