Re: 'pu' branch for StGIT

On Thu, 2007-08-09 at 09:38 +0200, Karl Hasselström wrote:

Well, I tried it, and then ran a script to update all local repositories. It converted everything to "version 3", so I'm sort of stuck with it. If the "version 3" code is not committed to the mainline StGIT, I'll have to convert my repositories back or even re-fetch them.

I have noticed two problems so far, but I cannot tell is they are specific to the "pu" branch.

1) Undead patches.

StGIT finds a patch I deleted long ago and shows it as unapplied. It cannot be deleted by "stg delete" because some files are missing.

$ stg delete at76_usb
Traceback (most recent call last):
  File "/home/proski/bin/stg", line 43, in <module>
    main()
  File "home/proski/lib/python2.5/site-packages/stgit/main.py", line 284, in main
  File "home/proski/lib/python2.5/site-packages/stgit/commands/delete.py", line 76, in func
  File "home/proski/lib/python2.5/site-packages/stgit/stack.py", line 1227, in delete_patch
  File "home/proski/lib/python2.5/site-packages/stgit/stack.py", line 1209, in delete_patch_data
  File "home/proski/lib/python2.5/site-packages/stgit/stack.py", line 160, in delete
OSError: [Errno 2] No such file or directory: '.git/patches/wireless-dev/patches/at76_usb'

That's Linux repository, and I'm on wireless-dev branch. There is a file .git/patches/wireless-dev/trash/at76_usb containing "None". There are two other files in that directory, but they have some SHA1 hashes.

There is also a file .git/patches/wireless-dev/patchorder, which contains "at76_usb".

I was updating the repository by "stg pull", there were two patches, "at76_usb" being first. It couldn't be merged, so I deleted it. I deleted the other patch as well, since I new it was applied upstream. After another "stg pull" at76_usb became "undead".

I cannot reproduce it on another repository.

2) Invisible branches.

StGIT stopped showing other branches. It's always showing the same branch, although it can switch to other branches:

[proski@dv linux-2.6]$ stg branch --list Available branches:

[proski@dv linux-2.6]$ stg branch wireless-2.6
Checking for changes in the working directory ... done
Switching to branch "wireless-2.6" ... done
[proski@dv linux-2.6]$ stg branch --list
Available branches:
  s     wireless-dev  | 
[proski@dv linux-2.6]$ stg branch linus       
Checking for changes in the working directory ... done
Switching to branch "linus" ... done
[proski@dv linux-2.6]$ stg branch --list
Available branches:
  s     wireless-dev  | 
[proski@dv linux-2.6]$ stg init
stg init: linus already initialized
[proski@dv linux-2.6]$