repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
archive: rename attribute specfile to export-subst
2007-05-16
Si
m
on
Ha
u
smann
Fix ca
l
l
ing git-p4
rebase fro
m
within
a
subdirec
t
ory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
i
m
on Hausmann
Give a better hint if git-p4 submit fail
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Added the
p
ossib
i
l
i
t
y
of skipping
patc
h
es during g
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n Hausmann
M
ake git-p4 wo
r
k with bar
e
repositories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simo
n
H
ausmann
Fix git
-
p4 clone //depot/proje
c
t
(
he
a
d import)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Ha
u
smann
Convert
e
d to unix
n
ewli
n
e
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Make submitting work on Windows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon
H
ausmann
Make sure all po
p
en c
a
lls use
b
inary mode (fo
r
Windows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausm
a
nn
Added a little
.
bat wrapper
f
r
om Marius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n
H
ausma
n
n
U
s
e the
s
ubp
r
o
cess m
o
dul
e
instead of popen2 to mak
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon Ha
u
smann
D
ocument some imple
m
entation details,
f
o
r
t
he
c
urious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Ha
u
smann
Cl
e
anup,
r
emoved the old tagging
c
ode
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Si
m
on Haus
m
ann
cleanup, renam
e
d self
.
globalPre
f
i
x
to self
.
depo
t
Path
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
Hausmann
Mic
r
o cleanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
i
mon H
a
u
smann
Doc cle
a
nups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
H
a
n
dle patc
h
erro
r
s in git-p
4
submit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
S
i
mon Ha
u
smann
A
n
ew a
t
tempt at
fix
i
ng
t
he child
-
fast-import-process
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
H
ausman
n
Slightly impro
v
ed f
o
r
matti
n
g of
t
h
e
raw_input questions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simo
n
Hausmann
Removed t
h
e ol
d
p
atch apply code from gi
t
-p4
s
ubmit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
imon Hausmann
Fix
t
h
e
tim
e
z
one form
a
t
t
ing
.
Now qgit also displays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simo
n
Hausmann
Print an error mes
s
a
g
e of some sort
i
f gi
t
f
ast-impo
r
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon Hausma
n
n
All
o
w for con
v
eni
e
nt rebasi
n
g
aft
e
r g
i
t-p4
sub
m
it
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Ad
d
ed a simple ex
a
mple of usage to t
h
e "documentation" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
fix variable usage (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
F
ix fil
e
determinat
i
on for #head imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausman
n
A
dded git-p4 clone conven
i
ence command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on Ha
u
smann
Ho
n
or --silent
f
o
r
lab
e
ls
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simo
n
H
ausman
n
Turn off potentially slow label detectio
n
by default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Ha
u
smann
Provide a tree summary
a
f
t
er git-p4 r
e
base
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simo
n
Hausmann
Added git-p4
reb
a
se convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon
H
a
us
m
a
nn
C
lean up py
t
hon class nam
e
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
S
imon Hausmann
Fix
"
co
m
pi
l
at
i
o
n
" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Ha
u
s
mann
Fix the do
c
s for g
i
t-p4 submit a
n
d
t
urn git-p4 sub
m
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon
Hausman
n
Fix var
i
a
b
le usage in ta
g
import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
Added support for mappi
n
g p4
l
abel
s
to gi
t
tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
S
imon Haus
m
an
n
git-p4 deb
u
g doesn't need a git r
e
pository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausmann
Don't
try to parse any options w
i
th
git-p4 d
e
bug
b
ut
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Prefe
r
g
i
t command over git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Si
m
on Hausmann
Minor cosmetic fixlet for the git-p4
submit
s
ync ques
t
ion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon H
a
usmann
Different
v
ersions of p4 h
a
ve
d
iffer
e
nt
o
utput for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausma
n
n
Use the new
incrementa
l
import style by default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon H
a
usmann
Make it pos
s
ible
t
o run git-p4 submi
t
from
w
ithin the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon
H
ausmann
Brand new s
m
art incremental import that doesn't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
usmann
Set the
default branch in run, not
in
t
he construct
o
r
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
usmann
Helper function to
c
h
e
ck the existance of
a revi
s
i
on
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausm
a
nn
Added some helper function
(
s) t
o
parse the dep
o
t pa
t
h
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Chan
g
ed the
default branch
for imports fro
m
"master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Hausm
a
n
n
Chang
e
d
the format of the
imported
lo
g
message sligh
t
ly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
au
s
man
n
Rem
o
ved t
h
e
.
py extension from git-p4 as it's a
n
noying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon H
a
usmann
D
o
n't show the submit template and the diff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Hausmann
Make it poss
i
b
l
e to invoke g
i
t-p4 fr
o
m
wi
t
hin subdirec
t
ori
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
o
n
Haus
m
ann
Made --app
l
y-as-patch th
e
defa
u
lt for git-p4 sub
m
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausmann
Fix support f
o
r deletions
i
n
g
it-p4 s
u
b
mit when
usi
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausmann
A
dded exp
e
r
i
m
ent
a
l but super-fast --ap
p
ly-as-pat
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on
Hausm
a
nn
Docu
m
ent
a
tion enhancement
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hau
s
mann
Start of the g
i
t-p4 documen
t
ation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Ha
u
s
mann
Remo
v
ed p4-fast-export and p4-git-sy
n
c
a
s they'v
e
been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
H
au
s
mann
F
ixed the
initia
l
version import by ge
t
ting the
file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Added missing "self"s to make the script evaluate correctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Completely unte
s
t
ed
"merge" of
p
4-
f
ast
-
expor
t
.
p
y into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
sync-t
o
-
p
erforce is now
calle
d
sub
m
it and fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
P
a
r
t
of th
e
code is co
p
yright by Trolltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
First (un
t
ested) attempt a
t
migra
t
i
ng p4
-
git-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon
H
a
u
s
mann
Pr
o
vide a lit
t
le b
i
t of help description for the
g
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
S
tart moving th
e
git-p4 t
o
ols
into one single script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pass the right num
b
er of argument
s
t
o
c
ommit
,
f
i
xes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Improved the git dir det
e
ction
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hausmann
Default to i
n
teractive sync
i
n
g
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Hausm
a
nn
Use
p4 revert
.
.
.
instead
o
f
r
evert -a
.
.
.
after s
u
b
m
itting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Haus
m
ann
Auto-detect the current git br
a
nch before submitt
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Ignore Apple resource files when
i
mporting f
r
om p
e
rf
o
r
ce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon
H
ausmann
Be nice and use /usr/bin/env p
y
thon
f
or
the git-p
4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Auto
m
atically
o
pera
t
e on a
t
emp
o
ra
r
y branch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Ha
u
smann
Lots
of bugfixes to p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausma
n
n
Fix git-dir optio
n
and allow reading log
s
u
b
sti
t
uti
o
n
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon H
a
usmann
Fir
s
t version of a new s
c
ript to submit changes back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on H
a
usmann
Split up the cach
e
commandlin
e
options in
t
o
(com
m
and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imon
Ha
u
smann
Redu
c
e th
e
number
o
f fals
e
"merges" by
s
k
ipping "branc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
M
ore
work on bran
c
h
detection
b
y imp
l
ementi
n
g
c
hangeIsBranc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausmann
More
c
ode c
l
eanups a
n
d preparat
i
ons
for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Minor code cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausmann
M
a
ke the p4 data/co
m
m
and c
a
c
h
e configurable
through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausma
n
n
Fixed p4-debug f
i
le extension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Sim
o
n
H
a
u
smann
Changed --known-branch
e
s t
o
t
a
k
e
a file as argume
n
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon
Hausmann
W
o
r
k in progress on d
e
t
ecting branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Sim
o
n H
a
us
m
ann
Adjust the
out
p
ut par
s
in
g
of git name-rev to hand
l
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Si
m
on Hausmann
Don't print a plain
n
e
wline at
t
he end of the ex
e
cut
i
on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
S
imon
Hausm
a
n
n
Mor
e
w
ork in --silent support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausm
a
nn
A
d
d
e
d
suppo
r
t for --silent so that p
4
-fas
t
-export
can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon Hau
s
man
n
Added p4 delet
e
behavioural emulatio
n
as todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Hausmann
Fix sin
g
le-branch impo
r
t
s
by skipping
t
h
e branch/m
e
rge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Sim
o
n Hausman
n
Use
s
e
t
s
.
Set()
instead of s
e
t() to run als
o
with olde
r
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Si
m
on Hausmann
Mak
e
i
t pos
s
ible to
s
pecif
y
the p4 changes to im
p
ort
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n Hausman
n
When trying to map p4 integrations to
git merges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hau
s
mann
Set git fast-impor
t
marks for every imported
change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n Hausma
n
n
Afte
r
marking a p4 branch a
s
merg
e
d do
n
't ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simo
n
Hausmann
Mo
r
e fixes
in
h
e
u
ristic p4 branch detectio
n
based on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
imo
n
Hausm
a
nn
Started
w
ork o
n
p4 b
r
anch detec
t
ion (experimental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Code
cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
S
i
m
o
n Ha
u
smann
Cleanups, remov
e
unused variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next