unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Dan Nicolaescu <dann@ics.uci.edu>
To: Torsten Bronger <bronger@physik.rwth-aachen.de>
Cc: 2157@emacsbugs.donarmstrong.com
Subject: bug#2157: 23.0.90; bzr support: vc-diff doesn't work with prefix argument on unchanged files
Date: Wed, 4 Feb 2009 07:48:10 -0800 (PST)	[thread overview]
Message-ID: <200902041548.n14FmA2I015985@rodan.ics.uci.edu> (raw)
In-Reply-To: <87vdrqli2i.fsf@physik.rwth-aachen.de> (Torsten Bronger's message of "Wed, 04 Feb 2009 09:31:01 +0100")

Torsten Bronger <bronger@physik.rwth-aachen.de> writes:

  > Hallöchen!
  > 
  > Dan Nicolaescu writes:
  > 
  > > Torsten Bronger <bronger@physik.rwth-aachen.de> writes:
  > >
  > > [...]
  > >
  > >> By the way, bug#618 is probably related to this.  Formerly, I had
  > >> missing revno in the modeline only in lightweight checkout, now I
  > >> have the same problem with all branches.  Maybe the branch
  > >> metadata format has diverged too much for vc-bzr?
  > >
  > > Is this still a problem now?  If it is and you can describe how to
  > > get a "lightweight checkout", it might be easy to fix.
  > 
  > It works for branches now but not for lightweight checkouts.  You
  > get a lightweight checkout with "bzr checkout --leightweight". LCs
  > don't have the file ".bzr/branch/last-revision", so unless you can
  > get the revno info from another file (I don't think you can), you
  > have to fork a Bazaar process.

It looks like the lightweight checkout contains a .bzr/branch/location
file that is not present in a normal one.   So that could be used to
differentiate between the two, like here:

--- vc-bzr.el.~1.74.~ Wed Feb  4 05:54:29 2009
+++ vc-bzr.el         Wed Feb  4 07:43:07 2009
@@ -327,7 +327,12 @@
        (lastrev-file (expand-file-name vc-bzr-admin-lastrev rootdir)))
     ;; This looks at internal files to avoid forking a bzr process.
     ;; May break if they change their format.
-    (if (file-exists-p branch-format-file)
+    (if (and 
+     (file-exists-p branch-format-file)
+      (not (file-exists-p 
+             (expand-file-name
+               (concat vc-bzr-admin-dirname
+                               "/branch/location") rootdir))))
         (with-temp-buffer
           (insert-file-contents branch-format-file)
           (goto-char (point-min))






  reply	other threads:[~2009-02-04 15:48 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <200903231626.n2NGQlXn010786@godzilla.ics.uci.edu>
2009-02-02 10:04 ` bug#2157: 23.0.90; bzr support: vc-diff doesn't work with prefix argument on unchanged files Torsten Bronger
2009-02-02 20:05   ` Dan Nicolaescu
2009-02-02 20:37     ` Torsten Bronger
2009-02-02 22:37       ` Dan Nicolaescu
2009-02-03  7:35         ` Torsten Bronger
2009-02-04  7:43           ` Dan Nicolaescu
2009-02-04  8:31             ` Torsten Bronger
2009-02-04 15:48               ` Dan Nicolaescu [this message]
2009-02-04 17:09                 ` Torsten Bronger
2009-02-03  7:48         ` Torsten Bronger
2009-03-23 16:35   ` bug#2157: marked as done (23.0.90; bzr support: vc-diff doesn't work with prefix argument on unchanged files) Emacs bug Tracking System

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200902041548.n14FmA2I015985@rodan.ics.uci.edu \
    --to=dann@ics.uci.edu \
    --cc=2157@emacsbugs.donarmstrong.com \
    --cc=bronger@physik.rwth-aachen.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).