git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 4/7] remote-bzr: update working tree

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 13, 2012, 23:47 UTC
Message-ID
<7vobhxwm3n.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAMP44s1ZdMK+0_pP3qkZUepOvkfMaXeY2BV0MFu5YOSV=40Dcw@mail.gmail.com>
Felipe Contreras <felipe.contreras@gmail.com> writes:
Show 31 quoted lines
> On Wed, Nov 28, 2012 at 11:38 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> Felipe Contreras <felipe.contreras@gmail.com> writes:
>>
>>> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
>>> ---
>>>  contrib/remote-helpers/git-remote-bzr | 2 ++
>>>  1 file changed, 2 insertions(+)
>>>
>>> diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
>>> index 2c05f35..5b89a05 100755
>>> --- a/contrib/remote-helpers/git-remote-bzr
>>> +++ b/contrib/remote-helpers/git-remote-bzr
>>> @@ -571,6 +571,8 @@ def do_export(parser):
>>>              repo.generate_revision_history(revid, marks.get_tip('master'))
>>>              revno, revid = repo.last_revision_info()
>>>              peer.import_last_revision_info_and_tags(repo, revno, revid)
>>> +            wt = peer.bzrdir.open_workingtree()
>>> +            wt.update()
>>>          print "ok %s" % ref
>>>      print
>>
>> Shouldn't this be squashed as part of one of the earlier patches?
>> The split between 1/7 (import first) and 2/7 (then support export)
>> makes sense, but this one looks more like "oops, we forgot to touch
>> the working tree while updating the history in the previous steps
>> and here is a fix" to me.
>
> Perhaps. It's not really clear if we should update the working tree at
> all. A 'git push' doesn't update the working directory on the remote,
> but a 'bzr push' does. I thought it was better to leave this
> distinction clear, in case this becomes an issue later on.

If you explained that in the log message, then we would have avoided this exchange, and more importantly, if you had a in-code comment there, it may help people who later want to add a knob to leave the working tree intact. The seed you sow now to help others, who may be less skillful and knowledgeable than you are, will help the project in the longer term.

Thanks. I don't mind rephrasing that four lines and amend the log message of what I have in 'pu', if that is what you want.

Previous: Felipe ContrerasNext: Junio C Hamano
Message 8 of 26 in “New remote-bzr remote helper”
  1. 0/7 New remote-bzr remote helperFelipe Contreras, Nov 11, 2012
  2. 1/7 Add new remote-bzr transport helperFelipe Contreras, Nov 11, 2012
  3. 2/7 remote-bzr: add support for pushingFelipe Contreras, Nov 11, 2012
  4. 3/7 remote-bzr: add support for remote repositoriesFelipe Contreras, Nov 11, 2012
  5. 4/7 remote-bzr: update working treeFelipe Contreras, Nov 11, 2012
  6. Junio C HamanoNov 28, 2012
  7. Felipe ContrerasDec 13, 2012
  8. Junio C HamanoDec 13, 2012
  9. Junio C HamanoDec 13, 2012
  10. Felipe ContrerasDec 14, 2012
  11. 5/7 remote-bzr: add simple testsFelipe Contreras, Nov 11, 2012
  12. Junio C HamanoNov 28, 2012
  13. 6/7 remote-bzr: add support for fecthing special modesFelipe Contreras, Nov 11, 2012
  14. 7/7 remote-bzr: add support to push special modesFelipe Contreras, Nov 11, 2012
  15. Felipe ContrerasNov 24, 2012
  16. Junio C HamanoNov 26, 2012
  17. Felipe ContrerasNov 26, 2012
  18. Junio C HamanoNov 27, 2012
  19. Felipe ContrerasNov 28, 2012
  20. Junio C HamanoNov 28, 2012
  21. Felipe ContrerasNov 28, 2012
  22. Junio C HamanoNov 28, 2012
  23. Felipe ContrerasNov 28, 2012
  24. Junio C HamanoNov 28, 2012
  25. Felipe ContrerasNov 28, 2012
  26. Felipe ContrerasNov 28, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.