repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Allow for convenient rebasing after git-p4 submit
2007-04-09
S
i
mon Hau
s
man
n
A
llow for convenie
n
t r
e
basing after g
i
t-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
mon Hausmann
A
d
ded a simple exampl
e
o
f
u
sage to
the "d
o
cumentat
i
o
n
" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n Hausm
a
nn
fix va
r
iable usag
e
(oo
p
s
)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon
H
aus
m
ann
Fix file determ
i
nat
i
on
for #head im
p
or
t
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
A
d
ded
g
it-p4 clone
c
o
n
venience c
o
m
m
and
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Honor --sile
n
t
for l
a
bels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
aus
m
ann
Turn off potentially
s
low label detect
i
on by default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
Pro
v
ide
a tree summary aft
e
r git-p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Haus
m
ann
Ad
d
e
d
git-p4 rebase convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Si
m
on
H
ausmann
Clean up python
c
l
ass names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
S
i
m
on
Hausmann
Fix "compi
l
atio
n
" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Sim
o
n Hausmann
Fix th
e
docs for git-p4 submit
a
nd tur
n
git-p4 submi
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simo
n
Hausmann
Fix
v
ariable usag
e
i
n tag impo
r
t
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hau
s
mann
A
dded support for
m
a
p
ping p4 labels to git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausma
n
n
git-p4 debug doe
s
n
'
t need a
g
it rep
o
s
i
tory
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Sim
o
n Hausmann
Do
n
'
t tr
y
to parse any
o
ptions wi
t
h git-p4
d
ebug b
u
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon
H
au
s
man
n
Pre
f
er
g
i
t
co
m
m
a
nd ov
e
r
g
it-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Haus
m
ann
Minor cosmetic f
i
xlet for
the git-p4
subm
i
t sync
q
uestio
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausman
n
Different v
e
rs
i
o
n
s of p4
h
ave different
o
utput
f
or
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon
Hausmann
Use the new incremental import style b
y
defaul
t
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
S
i
mon Hausmann
M
a
ke
it pos
s
ible to
ru
n
git-p4 submit
f
rom within th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
usmann
Bran
d
ne
w
smart incremental import t
h
at doesn't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Hausmann
S
e
t
t
he
default br
a
nch
i
n run, not in t
h
e
c
o
n
s
tructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Helper function to check the existance of a
revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Added
so
m
e help
e
r f
u
nction(s) to parse
t
he
d
epot
p
a
th
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon
H
ausma
n
n
C
h
a
nged the default b
r
anch for imports f
r
om "m
a
ster
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausman
n
Changed the forma
t
of the imported
l
og mes
s
age
s
lightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
us
m
a
n
n
Remov
e
d the
.
py
exten
s
ion
from git
-
p4
as it's anno
y
ing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
im
o
n Hausm
a
nn
Don't show the
submit temp
l
ate a
n
d
t
he diff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Make it possib
l
e to in
v
oke git-p4 from within subdirec
t
ories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Haus
m
a
n
n
Made --
a
p
ply-a
s
-patch the de
f
ault fo
r
git-p4
submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Haus
m
an
n
Fix support for d
e
le
t
ions in git-p4 submit w
h
e
n u
s
ing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
imon Haus
m
ann
Add
e
d experimental but s
u
per-
f
ast
--ap
p
ly-
a
s-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on Hausmann
Doc
u
m
entation enhanceme
n
ts
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Hausmann
Start of the git-p4 documentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Removed p4-f
a
st-export an
d
p4
-
git-sync as they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
imon
H
a
u
s
m
a
nn
Fix
e
d the initial version impo
r
t by gett
i
ng the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mon
H
a
usmann
Add
e
d miss
i
ng
"
self"s to make the scr
i
p
t
evalu
a
te cor
r
ectly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Hausman
n
C
o
mp
l
etely u
n
tested "me
r
ge" of
p
4-f
a
st-export
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
H
a
usmann
sync-to-per
f
o
r
ce i
s
now
cal
l
ed
s
u
bmit and fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon Hausmann
Part of the
c
o
d
e is cop
y
right by Trollte
c
h AS
A
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon Hausmann
First (untes
t
e
d
)
attempt a
t
migrating p
4
-git-s
y
nc into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
ausmann
Pro
v
ide a little b
i
t of
help d
e
scription fo
r
t
h
e git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Hau
s
mann
Start
mo
v
in
g
the g
i
t-p4 too
l
s int
o
one single script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mo
n
H
ausmann
Pass the
right number of
a
rguments
to commit, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Ha
u
s
m
a
nn
Improved the
git dir detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simo
n
Hausman
n
Defa
u
lt to interactive sync
i
ng
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Si
m
on Hausma
n
n
Use p4
r
evert
.
.
.
instead of revert -a
.
.
.
after submitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon
H
a
u
smann
Auto-detect the current git br
a
nch
b
efore submit
t
ing
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Ignore App
l
e
r
esource
files when importin
g
from p
e
rforc
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on
H
ausmann
Be nice and use /usr/bin/env python for
t
h
e git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hausmann
Au
t
o
m
atically op
e
ra
t
e on a temporar
y
b
r
anch, n
e
ed
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
Lots o
f
bugfixes to p4-git-sy
n
c
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
mon H
a
usmann
Fix git-dir option and a
l
l
ow readi
n
g
l
og substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon H
a
usmann
First ve
r
sion of
a
new script to submit chan
g
es back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Split up t
h
e cache commandli
n
e
o
p
t
i
ons
into (comm
a
nd
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mo
n
Hausmann
Reduce the number of false "merges" by skipping "branc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More work on bran
c
h
detection by im
p
lementing changeIsB
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausmann
M
ore
co
d
e
c
leanup
s
and
p
reparations for more br
a
n
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Ha
u
smann
Minor co
d
e cleanu
p
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
M
a
ke
the p
4
data/comm
a
nd cac
h
e
configura
b
le
through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausmann
Fixed
p4-debug f
i
le exte
n
sion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
C
h
ange
d
--known-br
a
n
c
hes to take a file as
a
r
g
um
e
nt
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
S
i
mon Haus
m
ann
Work
i
n prog
r
ess on de
t
ecting
branc
h
es
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Hausmann
Adjust
t
he
o
utput
parsing of
git name-re
v
to handle
.
.
.
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
w
l
ine at the end
of the execution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Sim
o
n Hausmann
M
ore
work in --sile
n
t su
p
port
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Ha
u
smann
Ad
d
e
d support for --
s
ilen
t
so
that p4-fast-e
x
por
t
can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon H
a
usmann
Adde
d
p4 delete behaviou
r
al
e
mulation as todo it
e
m
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Haus
m
ann
Fix sin
g
l
e
-b
r
a
n
c
h i
m
po
r
ts by skipping t
h
e branch/merg
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Use set
s
.
Set()
i
nstead of set() to run
also with o
l
der
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simo
n
Hausmann
Make it pos
s
ib
l
e to specify the p4 changes to imp
o
rt
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
S
imon Hausmann
When tr
y
ing to map p4 i
n
t
e
grations to g
i
t
me
r
ges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
imon Hausmann
Se
t
git
fast-import marks for ev
e
ry impor
t
ed change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Si
m
on Hau
s
mann
A
fter markin
g
a
p4 b
r
a
n
ch as merged don't ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon H
a
usmann
M
o
re fixes in
h
e
u
r
istic p4
branch d
e
tectio
n
based on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
mon Ha
u
sma
n
n
Started work
o
n p4 br
a
nch
detect
i
on (experimen
t
a
l
!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hau
s
mann
Code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Ha
u
smann
Cleanups, remove unu
s
ed
v
ariable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hausmann
Create lightwei
g
ht git
t
ags (using the "
r
eset" trick
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
A
dd
e
d
a l
i
ttle
hel
p
er script t
o
remove unu
s
ed tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on Hausman
n
Changed
the default git im
p
or
t
branch from "
p
4
" to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hau
s
man
n
Avoid the exc
e
ss
i
ve use of g
i
t tag
s
for ev
e
r
y
perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Minor code
cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hau
s
mann
Added a little helper script to
debug the output of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
Made the name of
the git
b
ranch used for
t
he
p
erforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Simon Ha
u
smann
Catch
io e
x
ceptions from git
f
a
s
t-import again
an
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausm
a
nn
Fi
x
calculati
o
n of the n
e
west imported revision
for
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Sim
o
n Ha
u
sman
n
Ma
k
e
s
pecifyi
n
g
t
he revision range
s
more co
n
venient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Make increm
e
ntal i
m
ports easier to use by sto
r
i
n
g th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Fix
e
d incrementa
l
im
p
orts by
using
t
he correct
"
from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Sim
o
n
H
a
us
m
a
nn
M
i
no
r
clean
u
p
s an
d
p
rint an error message o
f
git fa
s
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
im
o
n Ha
u
smann
Ini
t
i
al support fo
r
importing a directory f
r
o
m Perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Ha
u
smann
Co
d
e clea
n
ups, move th
e
code t
o
create a commit wit
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon
H
au
s
mann
Simplify the incremental import
b
y eli
m
ination the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Started
w
orking on inc
r
e
menta
l
i
m
p
o
r
ts from Perforc
e
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Fix file per
m
issions of p4-fas
t
-export
.
py to be exe
c
ut
a
ble
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Si
m
on H
a
usmann
Creat
e
a git t
a
g
f
or e
v
e
ry
chang
e
s
e
t imported from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
Hausmann
F
ixed d
i
spl
a
yi
n
g import pr
o
gress by ca
l
ling flush on
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Sim
o
n Hausmann
P
ermit calling p4-f
a
st-export with a depot path that
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next