Dynamic rescaling in doc-view.el

Dynamic rescaling in doc-view.el

[Tassilo Horn]

Hi all,

I've just pushed a change to doc-view that tries to use the ImageMagick
backend for displaying the PNG images.  In that case, scaling (+/-)
dynamically scales the images instead of reconverting the whole doc.

When committing, I had some bzr problems:

% bzr commit
Unable to obtain lock chroot-3070208716:///emacs/trunk/.bzr/branch/lock         
held by tsdh@vcs-noshell on host vcs-noshell [process #27158]
locked 4 minutes, 25 seconds ago
Will continue to try until 21:23:04, unless you press Ctrl-C
If you're sure that it's not being modified, use bzr break-lock chroot-3070208716:///emacs/trunk/.bzr/branch/lock
bzr: ERROR: Could not acquire lock "(remote lock)":
bzr+ssh://tsdh@bzr.savannah.gnu.org/emacs/

Could someone confirm that the commit arrived upstreams?

Bye,
Tassilo

Re: Dynamic rescaling in doc-view.el

[Eli Zaretskii]

> From: Tassilo Horn <tassilo@member.fsf.org>
> Date: Wed, 05 Jan 2011 22:27:12 +0100
> 
> When committing, I had some bzr problems:
> 
> % bzr commit
> Unable to obtain lock chroot-3070208716:///emacs/trunk/.bzr/branch/lock         
> held by tsdh@vcs-noshell on host vcs-noshell [process #27158]
> locked 4 minutes, 25 seconds ago
> Will continue to try until 21:23:04, unless you press Ctrl-C
> If you're sure that it's not being modified, use bzr break-lock chroot-3070208716:///emacs/trunk/.bzr/branch/lock
> bzr: ERROR: Could not acquire lock "(remote lock)":
> bzr+ssh://tsdh@bzr.savannah.gnu.org/emacs/
> 
> Could someone confirm that the commit arrived upstreams?

If bzr failed to acquire the lock, your commit didn't arrive
upstream.  Try later, and if the problem persists, break the lock.

Re: Dynamic rescaling in doc-view.el

[Tassilo Horn]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Tassilo Horn <tassilo@member.fsf.org>
>> Date: Wed, 05 Jan 2011 22:27:12 +0100
>> 
>> When committing, I had some bzr problems:
>> 
>> % bzr commit
>> Unable to obtain lock chroot-3070208716:///emacs/trunk/.bzr/branch/lock         
>> held by tsdh@vcs-noshell on host vcs-noshell [process #27158]
>> locked 4 minutes, 25 seconds ago
>> Will continue to try until 21:23:04, unless you press Ctrl-C
>> If you're sure that it's not being modified, use bzr break-lock chroot-3070208716:///emacs/trunk/.bzr/branch/lock
>> bzr: ERROR: Could not acquire lock "(remote lock)":
>> bzr+ssh://tsdh@bzr.savannah.gnu.org/emacs/
>> 
>> Could someone confirm that the commit arrived upstreams?
>
> If bzr failed to acquire the lock, your commit didn't arrive upstream.
> Try later, and if the problem persists, break the lock.

But how do I do (from my bound branch)?  bzr stat shows no changes, and
bzr log shows my commit...

Bye,
Tassilo

Re: Dynamic rescaling in doc-view.el

[Tassilo Horn]

Tassilo Horn <tassilo@member.fsf.org> writes:

>> If bzr failed to acquire the lock, your commit didn't arrive
>> upstream.  Try later, and if the problem persists, break the lock.
>
> But how do I do (from my bound branch)?  bzr stat shows no changes,
> and bzr log shows my commit...

Hm, my changes have arrived on the git mirror, so it seems to have
worked somehow, although I didn't do anything afterwards...

Bye,
Tassilo

Re: Dynamic rescaling in doc-view.el

[Eli Zaretskii]

> From: Tassilo Horn <tassilo@member.fsf.org>
> Cc: emacs-devel@gnu.org
> Date: Wed, 05 Jan 2011 23:13:11 +0100
> 
> Hm, my changes have arrived on the git mirror, so it seems to have
> worked somehow, although I didn't do anything afterwards...

Perhaps the lock from your original commit was left behind, and then
you tried another commit (the lock bzr claimed was locking the
repository was under your username).  Or maybe Andreas did something
to fix the problem.

Re: Dynamic rescaling in doc-view.el

[Glenn Morris]

Eli Zaretskii wrote:

> Perhaps the lock from your original commit was left behind, and then
> you tried another commit (the lock bzr claimed was locking the
> repository was under your username).  Or maybe Andreas did something
> to fix the problem.

I just now broke a 7+ hour old lock of tsdh@vcs-noshell because I
wanted to commit something.

Re: Dynamic rescaling in doc-view.el

[Tassilo Horn]

Glenn Morris <rgm@gnu.org> writes:

Hi Glenn,

>> Perhaps the lock from your original commit was left behind, and then
>> you tried another commit (the lock bzr claimed was locking the
>> repository was under your username).  Or maybe Andreas did something
>> to fix the problem.
>
> I just now broke a 7+ hour old lock of tsdh@vcs-noshell because I
> wanted to commit something.

Thanks.  I didn't figure out how to do that.  Bzr told me "use bzr
break-lock chroot-3070208716:///emacs/trunk/.bzr/branch/lock".  So I
issued that literally, and bzr told me 

  bzr: ERROR: Unsupported protocol for url \
       "chroot-3070208716:///emacs/trunk/.bzr/branch/lock"

Anyway, I still don't get how my changes finally went upstream.

First, I tried committing with vc, but after having that hanging for 5
minutes, I aborted it.  Then I tried to commit from the command line,
but there I always got the lock error.  But after some tries which all
resulted in the exact same error, bzr stat showed no local changes
anymore, and bzr log showed my commit.  But since Eli and Andreas didn't
see my changes at this point in time, it seems they were propagated
upstreams with some delay.  But I did not do anything!?!

Bye,
Tassilo

Re: Dynamic rescaling in doc-view.el

[Glenn Morris]

Tassilo Horn wrote:

> Thanks.  I didn't figure out how to do that.  Bzr told me "use bzr
> break-lock chroot-3070208716:///emacs/trunk/.bzr/branch/lock". 

I just use

bzr break-lock

Then it tells you which lock you are about to break and asks you to
confirm. So long as it's more than 10-15 ish mins old (I guess), go
ahead and break it. Stale locks happen infrequently, it's no big deal.

Re: Dynamic rescaling in doc-view.el

[Eli Zaretskii]

> From: Tassilo Horn <tassilo@member.fsf.org>
> Cc: Eli Zaretskii <eliz@gnu.org>,  emacs-devel@gnu.org
> Date: Thu, 06 Jan 2011 08:08:39 +0100
> 
> First, I tried committing with vc, but after having that hanging for 5
> minutes, I aborted it.  Then I tried to commit from the command line,
> but there I always got the lock error.

Whenever this happens, and you see the lock error on the second commit
attempt, you should "bzr break-lock" right there and then, because the
lock is yours, and you know that no commit/push operation is going on.
Anyone else will usually hesitate to break the lock immediately, so it
could stay there for quite some time.

Btw, since Savannah switched to bzr+ssh, the locks left behind after a
Ctrl-C are much less frequent.

Re: Dynamic rescaling in doc-view.el

[Eli Zaretskii]

> From: Tassilo Horn <tassilo@member.fsf.org>
> Cc: emacs-devel@gnu.org
> Date: Wed, 05 Jan 2011 22:49:04 +0100
> 
> >> % bzr commit
> >> Unable to obtain lock chroot-3070208716:///emacs/trunk/.bzr/branch/lock         
> >> held by tsdh@vcs-noshell on host vcs-noshell [process #27158]
> >> locked 4 minutes, 25 seconds ago
> >> Will continue to try until 21:23:04, unless you press Ctrl-C
> >> If you're sure that it's not being modified, use bzr break-lock chroot-3070208716:///emacs/trunk/.bzr/branch/lock
> >> bzr: ERROR: Could not acquire lock "(remote lock)":
> >> bzr+ssh://tsdh@bzr.savannah.gnu.org/emacs/
> >> 
> >> Could someone confirm that the commit arrived upstreams?
> >
> > If bzr failed to acquire the lock, your commit didn't arrive upstream.
> > Try later, and if the problem persists, break the lock.
> 
> But how do I do (from my bound branch)?

It tells you in the message: "bzr break-lock".

> bzr stat shows no changes, and bzr log shows my commit...

That's expected, since bzr commits locally before pushing upstream.

Re: Dynamic rescaling in doc-view.el

[Stefan Monnier]

> That's expected, since bzr commits locally before pushing upstream.

IIUC it doesn't: it only performs the local commit after the upstream
one is finished.  That's one of the reasons why a bound branch's commit
is not quite the same as "bzr commit; bzr push" in an unbound branch.


        Stefan

Re: Dynamic rescaling in doc-view.el

[Eli Zaretskii]

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: Tassilo Horn <tassilo@member.fsf.org>,  emacs-devel@gnu.org
> Date: Thu, 06 Jan 2011 22:52:32 -0500
> 
> > That's expected, since bzr commits locally before pushing upstream.
> 
> IIUC it doesn't: it only performs the local commit after the upstream
> one is finished.

Sorry, it's possible that I got duped by the "Saving data locally"
message that bzr displays before sending the commit upstream.

Re: Dynamic rescaling in doc-view.el

[Andreas Schwab]

Please try again.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Dynamic rescaling in doc-view.el

[joakim]

Tassilo Horn <tassilo@member.fsf.org> writes:

> Hi all,
>
> I've just pushed a change to doc-view that tries to use the ImageMagick
> backend for displaying the PNG images.  In that case, scaling (+/-)
> dynamically scales the images instead of reconverting the whole doc.

Fantastic!

>
> When committing, I had some bzr problems:
>
> % bzr commit
> Unable to obtain lock chroot-3070208716:///emacs/trunk/.bzr/branch/lock         
> held by tsdh@vcs-noshell on host vcs-noshell [process #27158]
> locked 4 minutes, 25 seconds ago
> Will continue to try until 21:23:04, unless you press Ctrl-C
> If you're sure that it's not being modified, use bzr break-lock chroot-3070208716:///emacs/trunk/.bzr/branch/lock
> bzr: ERROR: Could not acquire lock "(remote lock)":
> bzr+ssh://tsdh@bzr.savannah.gnu.org/emacs/
>
> Could someone confirm that the commit arrived upstreams?
>
> Bye,
> Tassilo

-- 
Joakim Verona